合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToSysUserRoleMapper.java

@@ -27,4 +27,11 @@ public interface ToSysUserRoleMapper {
      * @return
      */
     List<ToSysUserRole> selelctByRoleId(@Param("roleId") Integer roleId);
+
+    /**
+     * 根据 角色id 删除关联关系
+     * @param list
+     * @return
+     */
+    int deleteByRoleId(List<Integer> list);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysRoleServiceImpl.java

@@ -190,10 +190,10 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
     public ResponseBean deleteRole(List<Integer> ids, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         ids.forEach(e ->{
-            List<ToSysUserRole> userRoleList = toSysUserRoleMapper.selelctByRoleId(e);
-            if (CollectionUtils.isNotEmpty(userRoleList)) {
-                throw new WisdomException("角色存在用户关联关系, 无法删除!");
-            }
+//            List<ToSysUserRole> userRoleList = toSysUserRoleMapper.selelctByRoleId(e);
+//            if (CollectionUtils.isNotEmpty(userRoleList)) {
+//                throw new WisdomException("角色存在用户关联关系, 无法删除!");
+//            }
             ToSysRole toSysRole = toSysRoleMapper.selectByPrimaryKey(e);
             if (null == toSysRole) {
                 throw new WisdomException("删除失败, 角色编号 " + e + " 不存在!");
@@ -203,6 +203,9 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
             toSysRole.setUpdateDate(new Date());
             toSysRoleMapper.updateByPrimaryKeySelective(toSysRole);
         });
+        // 删除这个角色下关联关系
+        toSysUserRoleMapper.deleteByRoleId(ids);
+
         responseBean.addSuccess("操作成功!");
         return responseBean;
     }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -18,12 +18,12 @@ import com.community.huiju.vo.ToUserVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.security.auth.callback.TextOutputCallback;
 import java.util.*;
 
 @Service("iToUserServer")
@@ -87,10 +87,19 @@ public class ToUserServerImpl implements IToUserService {
         ToUserVO toUserVO = new ToUserVO();
         BeanUtils.copyProperties(toUser,toUserVO);
 
-        List<ToSysRole> sysRoleList = toSysRoleMapper.selectRoleByUserId(userId);
-        toUserVO.setRoles(sysRoleList);
-        // 菜单权限
-        toUserVO.setPermissionList(getPermission(userId));
+        List<ToSysRole> roleList = toSysRoleMapper.selectRoleByUserId(userId);
+        if (CollectionUtils.isNotEmpty(roleList)) {
+            List<ToSysRole> sysRoleList = toSysRoleMapper.selectRoleByUserId(userId);
+            toUserVO.setRoles(sysRoleList);
+            // 菜单权限
+            toUserVO.setPermissionList(getPermission(userId));
+        } else {
+            ToSysRole toSysRole = new ToSysRole();
+            toSysRole.setRoleName("没有角色");
+            toUserVO.setRoles(Arrays.asList(toSysRole));
+            // 菜单权限
+            toUserVO.setPermissionList(Collections.EMPTY_LIST);
+        }
         response.addSuccess(toUserVO);
 
         return response;

CODE/smart-community/operate-api/src/main/resources/mapper/ToSysUserRoleMapper.xml

@@ -83,4 +83,14 @@
     where role_id = #{roleId,jdbcType=INTEGER}
   </select>
 
+  <delete id="deleteByRoleId" parameterType="list" >
+    delete from
+    to_sys_user_role
+    where role_id in (
+      <foreach collection="list" item="item" separator=",">
+        #{item}
+      </foreach>
+    )
+  </delete>
+
 </mapper>

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -50,11 +50,12 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', data.roles)
-          } else {
-            reject('getInfo: roles must be a non-null array !')
-          }
+          // if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+          //   commit('SET_ROLES', data.roles)
+          // } else {
+          //   reject('getInfo: roles must be a non-null array !')
+          // }
+          commit('SET_ROLES', data.roles)
           commit('SET_NAME', data.userName)
           commit('SET_AVATAR', data.loginName)
           commit('SET_USER_DATA', data)

VUECODE/smart-operate-manage/src/views/account/role/add/index.vue

@@ -4,7 +4,8 @@
       <el-form-item label="角色名称" prop="roleName">
         <el-input v-model="ruleForm.roleName"/>
       </el-form-item>
-      <el-form-item label="角色描述" prop="description">
+      <!-- prop="description" -->
+      <el-form-item label="角色描述">
         <el-input v-model="ruleForm.description"/>
       </el-form-item>
       <el-form-item label="权限资源" prop="menuArray">

VUECODE/smart-operate-manage/src/views/account/role/edi/index.vue

@@ -4,7 +4,8 @@
       <el-form-item label="角色名称" prop="roleName">
         <el-input v-model="ruleForm.roleName"/>
       </el-form-item>
-      <el-form-item label="角色描述" prop="description">
+      <!--  prop="description" -->
+      <el-form-item label="角色描述">
         <el-input v-model="ruleForm.description"/>
       </el-form-item>
       <el-form-item label="权限资源" prop="menuArray">
@@ -59,7 +60,7 @@ export default {
   },
   mounted() {
     this.ruleForm.id = this.$route.params.id
-    this.getMenuList()
+    // 获取用户数据
     this.getInfo()
   },
   methods: {
@@ -125,6 +126,8 @@ export default {
         for (const i in resMenu) {
           this.ruleForm.menuArray.push(resMenu[i].menuId)
         }
+
+        this.getMenuList()
       }).catch(() => {
         console.log('error GetInfo')
       })

VUECODE/smart-operate-manage/src/views/account/role/info/index.vue

@@ -60,7 +60,7 @@ export default {
   },
   mounted() {
     this.ruleForm.id = this.$route.params.id
-    this.getMenuList()
+    // 获取用户数据
     this.getInfo()
   },
   methods: {
@@ -93,6 +93,8 @@ export default {
         for (const i in resMenu) {
           this.ruleForm.menuArray.push(resMenu[i].menuId)
         }
+
+        this.getMenuList()
       }).catch(() => {
         console.log('error GetInfo')
       })

VUECODE/smart-operate-manage/src/views/banner/infoBanner/index.vue

@@ -301,6 +301,5 @@ export default {
   height: 178px;
   display: block;
 }
-
 </style>