修改：

1.用户管理模块，修改用户，角色修改保存后，角色还是之前的角色
2.用户管理模块，修改用户，部门修改保存后，部门还是之前的部门
3.用户管理模块，修改用户，岗位修改保存后，岗位还是之前的岗位
4.岗位管理，修改部门，部门还是之前的部门

yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java

@@ -91,6 +91,7 @@ public class JobController {
     @PreAuthorize("@el.check('admin','job:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody Job resources){
         //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
+        resources.setDeptId(resources.getDept().getId());
         jobService.saveOrUpdate(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }

yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java

@@ -259,6 +259,25 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
         if(user2!=null&&!user.getId().equals(user2.getId())){
             throw new EntityExistException(User.class,"email",resources.getEmail());
         }
+        user.setUsername(resources.getUsername());
+        user.setEmail(resources.getEmail());
+        user.setEnabled(resources.getEnabled());
+        user.setDeptId(resources.getDept().getId());
+        user.setJobId(resources.getJob().getId());
+        user.setPhone(resources.getPhone());
+        user.setNickName(resources.getNickName());
+        user.setSex(resources.getSex());
+        boolean result = this.saveOrUpdate(user);
+        usersRolesService.lambdaUpdate().eq(UsersRoles ::getUserId,resources.getId()).remove();
+        UsersRoles usersRoles = new UsersRoles();
+        usersRoles.setUserId(resources.getId());
+        Set<Role> set = resources.getRoles();
+        for (Role roleIds : set ) {
+            usersRoles.setRoleId(roleIds.getId());
+        }
+        if (result) {
+            usersRolesService.save(usersRoles);
+        }
 
         // 如果用户的角色改变了，需要手动清理下缓存
         if (!resources.getRoles().equals(user.getRoles())) {
@@ -267,17 +286,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
             key = "role::findByUsers_Id:" + user.getId();
             redisUtils.del(key);
         }
-
-        user.setUsername(resources.getUsername());
-        user.setEmail(resources.getEmail());
-        user.setEnabled(resources.getEnabled());
-        user.setRoles(resources.getRoles());
-        user.setDept(resources.getDept());
-        user.setJob(resources.getJob());
-        user.setPhone(resources.getPhone());
-        user.setNickName(resources.getNickName());
-        user.setSex(resources.getSex());
-        this.saveOrUpdate(user);
     }
 
     @Override

yshop-system/src/main/resources/config/application-dev.yml

@@ -41,7 +41,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: root
+    password:
     #连接超时时间
     timeout: 5000