修改用户

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -83,8 +83,7 @@ public class PermissionServiceImpl implements PermissionService {
         }
         if (admin.getMachineId().contains(",")) {
             throw new Exception("机器编号格式错误");
-        }
-    else {
+        } else {
             BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
             admin.setPassword(passwordEncoder.encode(("123456")));
             permissionMapper.addPermission(admin);
@@ -142,14 +141,17 @@ public class PermissionServiceImpl implements PermissionService {
         }
         if (adminVo.getMachineId().contains(",")) {
             throw new Exception("机器编号格式错误");
-        }
-        else {
+        } else {
             Admin admin = new Admin();
             admin.setAccount(adminVo.getAccount());
             admin.setAdminName(adminVo.getAdminName());
             admin.setMarket(adminVo.getMarket());
             admin.setPostiton(adminVo.getPostiton());
+            if (adminVo.getMachineIds() == null) {
+                admin.setMachineId(adminVo.getMachineId());
+            } else {
                 admin.setMachineId(adminVo.getMachineId() + "," + adminVo.getMachineIds());
+            }
             admin.setRemark(adminVo.getRemark());
             permissionMapper.updateAdmin(admin);
             Password password = new Password();
@@ -157,7 +159,8 @@ public class PermissionServiceImpl implements PermissionService {
             password.setNewPassword(adminVo.getPassword());
             if (adminService.resetPassword(password) == 0) {
                 return Result.error("密码更改失败");
-            };
+            }
+            ;
             return Result.success("成功");
         }
     }