user

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java

@@ -80,8 +80,8 @@ public class UserController {
     @ApiOperation("修改用户")
     @PutMapping
 //    @SaCheckPermission("user:edit")
-    public ResponseEntity<Object> update( @RequestBody SysUser resources) throws Exception {
+    public ResponseEntity<Object> update( @RequestBody Map resources) throws Exception {
-        userService.saveOrUpdate(resources);
+        userService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java

@@ -49,6 +49,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptIds
      */
     void saveUserDeptRelation(String UserId, Collection<String> deptIds);
+    void delUserDeptRelation(String user);
 
     /**
      * 更新部门：同时更新节点

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java

@@ -24,6 +24,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      * @param deptId
      */
     void saveDeptRelation(@Param("user") String UserId,@Param("depts") Collection<String> deptId);
+    void delDeptRelation(@Param("user") String UserId);
 
     List<Map> getDeptRelation(@Param("deptIds") Collection<String> deptIds);
 

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml

@@ -8,6 +8,10 @@
            (#{user},#{dept})
         </foreach>
     </insert>
+    <delete id="delDeptRelation">
+        delete from sys_user_dept where user_id = #{user}
+    </delete>
+
     <update id="updateSubCount">
         update sys_dept set sub_count =
         (select m.count from (select count(*) count from sys_dept where pid = #{pid}) as m)

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java

@@ -113,6 +113,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         sysDeptMapper.saveDeptRelation(userId,deptIds);
     }
 
+    @Override
+    public void delUserDeptRelation(String user) {
+        sysDeptMapper.delDeptRelation(user);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateDept(SysDept dept) {

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java

@@ -60,4 +60,5 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param deptIds
      */
     void saveUserRoleRelation(String UserId, List<String> deptIds);
+    void delUserRoleRelation(String UserId);
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java

@@ -21,6 +21,7 @@ import java.util.Set;
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 
     void saveRoleRelation(@Param("user") String UserId, @Param("roles") Collection<String> roles);
+    void delRoleRelation(@Param("user") String UserId);
 
     void deleteRoleMenuBatchRoleIds(Collection<String> ids);
 

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml

@@ -8,6 +8,12 @@
            (#{user},#{role})
         </foreach>
     </insert>
+    <delete id="delRoleRelation">
+        delete from sys_users_roles where user_id = #{user}
+    </delete>
+
+
+
     <insert id="insertRoleMenu">
         insert into sys_roles_menus values
         <foreach collection="menuIds"  item="menuId" separator=",">

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java

@@ -7,10 +7,12 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.SecurityUtils;
@@ -20,6 +22,7 @@ import org.nl.system.service.role.dao.mapper.SysRoleMapper;
 import org.nl.system.service.menu.dao.mapper.SysMenuMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -133,8 +136,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public void saveUserRoleRelation(String UserId, List<String> deptIds) {
+    public void saveUserRoleRelation(String user, List<String> roles) {
-
+        if (StringUtils.isEmpty(user) || CollectionUtils.isEmpty(roles)){
+            return;
+        }
+        roleMapper.saveRoleRelation(user,roles);
     }
 
+    @Override
+    public void delUserRoleRelation(String user) {
+        roleMapper.delRoleRelation(user);
+    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java

@@ -27,4 +27,6 @@ public interface ISysUserService extends IService<SysUser> {
 
     void create(Map userDetail);
 
+    void update(Map userDetail);
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.common.config.FileProperties;
 import org.nl.modules.common.utils.FileUtil;
@@ -25,13 +26,11 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * <p>
@@ -94,7 +93,29 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
             deptService.saveUserDeptRelation(userId,(List)userDetail.get("depts"));
         };
         if (userDetail.get("roles") !=null){
-            roleService.saveUserRoleRelation(userId,(List)userDetail.get("depts"));
+            roleService.saveUserRoleRelation(userId,(List)userDetail.get("roles"));
         };
     }
+
+    @Override
+    @SneakyThrows
+    @Transactional
+    public void update(Map userDetail) {
+        if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("userId")==null){
+            return;
+        }
+        SysUser sysUser = new SysUser();
+        BeanUtils.populate(sysUser,userDetail);
+        sysUser.setUpdateTime(new Date());
+        sysUser.setUpdateId(SecurityUtils.getCurrentUserId());
+        this.updateById(sysUser);
+        if (userDetail.get("depts") !=null){
+            deptService.delUserDeptRelation(sysUser.getUserId());
+            deptService.saveUserDeptRelation(sysUser.getUserId(),(List)userDetail.get("depts"));
+        };
+        if (userDetail.get("roles") !=null){
+            roleService.delUserRoleRelation(sysUser.getUserId());
+            roleService.saveUserRoleRelation(sysUser.getUserId(),(List)userDetail.get("roles"));
+        }
+    }
 }

nladmin-ui/src/api/system/menu.js

@@ -25,7 +25,6 @@ export function getMenusByRole(params) {
 
 export function getMenuSuperior(ids) {
   const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
-  debugger
   return request({
     url: 'api/sysMenu/superior',
     method: 'post',

nladmin-ui/src/views/login.vue

@@ -133,7 +133,6 @@ export default {
             Cookies.remove('rememberMe')
           }
           this.$store.dispatch('Login', user).then(() => {
-            debugger
             this.loading = false
             window.location.href = this.redirect
             // if (this.redirect === 'http://localhost:8013/dashboard'){

nladmin-ui/src/views/system/menu/index.vue

@@ -259,7 +259,6 @@ export default {
       }, 100)
     },
     getSupDepts(menuId) {
-      debugger
       crudMenu.getMenuSuperior(menuId).then(res => {
         const children = res.map(function(obj) {
           if (!obj.leaf && !obj.children) {

nladmin-ui/src/views/system/user/index.vue

@@ -477,7 +477,6 @@ export default {
       userRoles = []
       const _this = this
       if (form.roles !== null && form.roles.length > 0) {
-        debugger
         form.roles.forEach(function(role, index) {
           _this.roleDatas.push(role)
           const rol = { id: role }