Главная Обзор Помощь
Регистрация Войти
zhoufan
/
zxkf_api
Следить 1
В избранное 0
Ответвить 0
Код Обсуждения 0 Запросы на слияние 0 Коммиты 177 Релизы 0 Вики
Просмотр исходного кода

修改

zhoufan лет назад: 2
Родитель
0d851a93eb
Сommit
0a4c5d20ce
3 измененных файлов с 41 добавлено и 25 удалено
Разделённый вид Показать статистику Diff
  1. 7 11
      zxkf-api/src/main/java/api/controller/system/UserController.java
  2. 12 4
      zxkf-service/src/main/java/api/service/system/IUserService.java
  3. 22 10
      zxkf-service/src/main/java/api/service/system/impl/UserServiceImpl.java

+ 7 - 11
zxkf-api/src/main/java/api/controller/system/UserController.java
Просмотреть файл 

@@ -36,8 +36,6 @@ public class UserController extends BaseController {
36 36 
     @Autowired
37 37 
     private IUserService userService;
38 38 
     @Autowired
39 
-    private UserMapper userMapper;
40 
-    @Autowired
41 39 
     private IDeptService deptService;
42 40 
     @Autowired
43 41 
     private IRoleService roleService;
 
@@ -79,7 +77,7 @@ public class UserController extends BaseController {
79 77 
     @Log(title = "查询用户详情", businessType = BusinessType.QUERY)
80 78 
     @GetMapping("/{id}")
81 79 
     public AjaxResult getInfo(@PathVariable Long id) {
82 
-        User user = userMapper.selectUserById(id);
80 
+        User user = userService.selectUserById(id);
83 81 
         if (user == null) {
84 82 
             return Error("用户不存在");
85 83 
         }
 
@@ -90,12 +88,11 @@ public class UserController extends BaseController {
90 88 
     @Log(title = "新增用户", businessType = BusinessType.INSERT)
91 89 
     @PostMapping
92 90 
     public AjaxResult add(@RequestBody User user) {
93 
-        Integer integer = 0;
94 
-        if (!userService.checkUserNameUnique(user, integer)) {
91 
+        if (!userService.checkUserNameUnique(user)) {
95 92 
             return Error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
96 
-        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user, integer)) {
93 
+        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
97 94 
             return Error("新增用户'" + user.getUserName() + "'失败，手机号码已存在或者手机号格式错误");
98 
-        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user, integer)) {
95 
+        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
99 96 
             return Error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
100 97 
         }
101 98 
         user.setPassword(SecretHelper.MD5(user.getPassword()));
 
@@ -113,14 +110,13 @@ public class UserController extends BaseController {
113 110 
     @Log(title = "修改角色信息", businessType = BusinessType.UPDATE)
114 111 
     @PutMapping
115 112 
     public AjaxResult edit(@RequestBody User user) {
116 
-        Integer integer = 1;
117 113 
         userService.checkUserAllowed(user);
118 114 
         userService.checkUserDataScope(user);
119 
-        if (!userService.checkUserNameUnique(user, integer)) {
115 
+        if (!userService.checkUserNameUnique(user)) {
120 116 
             return Error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
121 
-        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user, integer)) {
117 
+        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
122 118 
             return Error("修改用户'" + user.getUserName() + "'失败，手机号码已存在或者手机号格式错误");
123 
-        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user, integer)) {
119 
+        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
124 120 
             return Error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
125 121 
         }
126 122 
         user.setCreateBy(CurrentUser().getUserName());

+ 12 - 4
zxkf-service/src/main/java/api/service/system/IUserService.java
Просмотреть файл 

@@ -28,14 +28,14 @@ public interface IUserService extends IBaseService<User> {
28 28 
      * @param user 用户信息
29 29 
      * @return 结果
30 30 
      */
31 
-    public boolean checkUserNameUnique(User user,Integer integer);
31 
+    public boolean checkUserNameUnique(User user);
32 32 
     /**
33 33 
      * 校验用户昵称是否唯一
34 34 
      *
35 35 
      * @param user 用户信息
36 36 
      * @return 结果
37 37 
      */
38 
-    public boolean checkNickNameUnique(User user,Integer integer);
38 
+    public boolean checkNickNameUnique(User user);
39 39
40 40 
     /**
41 41 
      * 校验手机号码是否唯一
 
@@ -43,7 +43,7 @@ public interface IUserService extends IBaseService<User> {
43 43 
      * @param user 用户信息
44 44 
      * @return 结果
45 45 
      */
46 
-    public boolean checkPhoneUnique(User user,Integer integer);
46 
+    public boolean checkPhoneUnique(User user);
47 47
48 48 
     /**
49 49 
      * 校验email是否唯一
 
@@ -51,7 +51,7 @@ public interface IUserService extends IBaseService<User> {
51 51 
      * @param user 用户信息
52 52 
      * @return 结果
53 53 
      */
54 
-    public boolean checkEmailUnique(User user,Integer integer);
54 
+    public boolean checkEmailUnique(User user);
55 55
56 56 
     /**
57 57 
      * 导入用户数据
 
@@ -78,6 +78,14 @@ public interface IUserService extends IBaseService<User> {
78 78 
     public void checkUserDataScope(User user);
79 79
80 80 
     /**
81 
+     * 通过用户ID查询用户
82 
+     *
83 
+     * @param userId 用户ID
84 
+     * @return 用户对象信息
85 
+     */
86 
+    public User selectUserById(Long userId);
87 
+
88 
+    /**
81 89 
      * 根据roleid获取用户列表
82 90 
      */
83 91 
     public List<User> selectUserListByRoleId(Long roleId);

+ 22 - 10
zxkf-service/src/main/java/api/service/system/impl/UserServiceImpl.java
Просмотреть файл 

@@ -64,13 +64,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
64 64 
      * @return 结果
65 65 
      */
66 66 
     @Override
67 
-    public boolean checkUserNameUnique(User user, Integer integer) {
67 
+    public boolean checkUserNameUnique(User user) {
68 68 
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
69 69 
         qw.eq(User::getUserName, user.getUserName()).eq(User::getDelFlag, "0");
70 70 
         User entity = this.getEntity(qw);
71 71
72 72 
         if (!StringHelper.isNull(entity)) {
73 
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
73 
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
74 74 
                 return true;
75 75 
             }
76 76 
             return false;
 
@@ -85,13 +85,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
85 85 
      * @return 结果
86 86 
      */
87 87 
     @Override
88 
-    public boolean checkNickNameUnique(User user, Integer integer) {
88 
+    public boolean checkNickNameUnique(User user) {
89 89 
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
90 90 
         qw.eq(User::getNickName, user.getNickName()).eq(User::getDelFlag, "0");
91 91 
         User entity = this.getEntity(qw);
92 92
93 93 
         if (!StringHelper.isNull(entity)) {
94 
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
94 
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
95 95 
                 return true;
96 96 
             }
97 97 
             return false;
 
@@ -106,7 +106,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
106 106 
      * @return
107 107 
      */
108 108 
     @Override
109 
-    public boolean checkPhoneUnique(User user, Integer integer) {
109 
+    public boolean checkPhoneUnique(User user) {
110 110 
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
111 111 
         qw.eq(User::getPhonenumber, user.getPhonenumber()).eq(User::getDelFlag, "0");
112 112 
         User entity = this.getEntity(qw);
 
@@ -115,7 +115,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
115 115 
             return false;
116 116 
         }
117 117 
         if (!StringHelper.isNull(entity)) {
118 
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
118 
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
119 119 
                 return true;
120 120 
             }
121 121 
             return false;
 
@@ -130,13 +130,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
130 130 
      * @return
131 131 
      */
132 132 
     @Override
133 
-    public boolean checkEmailUnique(User user, Integer integer) {
133 
+    public boolean checkEmailUnique(User user) {
134 134 
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
135 135 
         qw.eq(User::getEmail, user.getEmail()).eq(User::getDelFlag, "0");
136 136 
         User entity = this.getEntity(qw);
137 137
138 138 
         if (!StringHelper.isNull(entity)) {
139 
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
139 
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
140 140 
                 return true;
141 141 
             }
142 142 
             return false;
 
@@ -163,12 +163,24 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
163 163 
      */
164 164 
     @Override
165 165 
     public void checkUserDataScope(User user) {
166 
-        if (user == null) {
167 
-            throw new RuntimeException("没有权限访问用户数据！");
166 
+        if(!user.isAdmin()) {
167 
+            if (user == null) {
168 
+                throw new RuntimeException("没有权限访问用户数据！");
169 
+            }
168 170 
         }
169 171 
     }
170 172
171 173 
     /**
174 
+     * 通过用户ID查询用户
175 
+     *
176 
+     * @param userId 用户ID
177 
+     * @return 用户对象信息
178 
+     */
179 
+    public User selectUserById(Long userId){
180 
+        return userMapper.selectUserById(userId);
181 
+    }
182 
+
183 
+    /**
172 184 
      * 导入用户数据
173 185 
      *
174 186 
      * @param userList        用户数据列表