谭斌 2 yıl önce
ebeveyn
işleme
835a74d54c

+ 12 - 16
authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -105,30 +105,26 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
         //更新角色信息
         List<Long> roleIds = updateDto.getRoleIds();
         if (CollUtil.isNotEmpty(roleIds)) {
-            List<SysUserRole> surList = sysUserRoleService.list(Wrappers.<SysUserRole>lambdaQuery()
-                    .eq(SysUserRole::getWorkUserId, sysWorkUser.getId())
+            sysUserRoleService.remove(Wrappers.<SysUserRole>lambdaUpdate().eq(SysUserRole::getWorkUserId, sysWorkUser.getId())
                     .eq(SysUserRole::getSysId, updateDto.getSysId()));
 
-            if (CollUtil.isNotEmpty(surList)) {
-                removeBatchByIds(surList);
-                List<SysUserRole> sysUserRoleList = roleIds.stream().map(roleId -> new SysUserRole()
-                        .setRoleId(roleId).setWorkUserId(sysWorkUser.getId()).setSysId(updateDto.getSysId())).collect(Collectors.toList());
-                //保存用户角色绑定信息
-                sysUserRoleService.saveBatch(sysUserRoleList);
-            }
+            List<SysUserRole> sysUserRoleList = roleIds.stream().map(roleId -> new SysUserRole()
+                    .setRoleId(roleId).setWorkUserId(sysWorkUser.getId()).setSysId(updateDto.getSysId())).collect(Collectors.toList());
+            //保存用户角色绑定信息
+            sysUserRoleService.saveBatch(sysUserRoleList);
+
         }
         //更新部门信息
         List<Long> deptIds = updateDto.getDeptIds();
         if (CollUtil.isNotEmpty(deptIds)) {
-            List<SysUserDept> sysUserDeptList = sysUserDeptService.list(Wrappers.<SysUserDept>lambdaQuery()
+            sysUserDeptService.remove(Wrappers.<SysUserDept>lambdaUpdate()
                     .eq(SysUserDept::getWorkUserId, sysWorkUser.getId())
                     .eq(SysUserDept::getSysId, updateDto.getSysId()));
-            if (CollUtil.isNotEmpty(sysUserDeptList)) {
-                removeBatchByIds(sysUserDeptList);
-                List<SysUserDept> newSysUserDeptList = deptIds.stream().map(deptId -> new SysUserDept()
-                        .setDeptId(deptId).setWorkUserId(sysWorkUser.getId()).setSysId(updateDto.getSysId())).collect(Collectors.toList());
-                sysUserDeptService.saveBatch(newSysUserDeptList);
-            }
+
+            List<SysUserDept> newSysUserDeptList = deptIds.stream().map(deptId -> new SysUserDept()
+                    .setDeptId(deptId).setWorkUserId(sysWorkUser.getId()).setSysId(updateDto.getSysId())).collect(Collectors.toList());
+            sysUserDeptService.saveBatch(newSysUserDeptList);
+
         }
         return R.ok(Boolean.TRUE);
     }