初始化权限变动

src/main/java/org/rcisoft/business/bdictionary/dao/BDictionaryRepository.java

@@ -28,7 +28,7 @@ public interface BDictionaryRepository extends BaseMapper<BDictionary> {
             " <if test=\"configList != null and configList.size()>0 \">and type in " +
             " <foreach item='item' index='index' collection='configList' open='(' separator=',' close=')'> #{item} </foreach> " +
             " </if> " +
-            "  order by sort"+
+            "  order by sort "+
             " </script>")
     @ResultMap(value = "BaseResultMap" )
     List<BDictionary> findAllColumnConfig(@Param("curUser") CurUser curUser, @Param("configList") List<String> configList);

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -184,7 +184,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     public int addAdminRoleMenuUser(CurUser curUser) {
 
-        String privilege = "M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,F-LABEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-STATISTICS-VIEW,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT";
+        String privilege = "M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT";
         //主管理员角色id
         String mRId = IdGen.uuid();
         //初始化角色（新加公司超级管理员）

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -201,7 +201,7 @@ public class SysUserController extends PaginationController<SysUser> {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                userServiceImpl.queryAllRoleById(curUser.getUserId()));
+                userServiceImpl.queryAllRoleById(curUser));
     }
 
     @GetMapping("/test")

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -219,9 +219,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             " where 1=1 " +
             " and u.business_id = #{userId} " +
             " and u.del_flag !=1 " +
+            " and u.corp_id = #{corpId} " +
+            " and r.corp_id = #{corpId} " +
             " and u.flag = 1 " +
             " and r.r_status = 1 ")
-    List<String>queryAllRoleById(@Param("userId") String userId);
+    List<String>queryAllRoleById(CurUser curUser);
 
     @Select("<script>select " +
             " (select count(1) from " +

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

@@ -40,7 +40,7 @@ public interface SysUserService {
 
     SysUser getUserState(String id);
 
-    String queryAllRoleById(String userId);
+    Object queryAllRoleById(CurUser curUser);
 
     Map<String,Object> queryAllDepart();
 

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -2,6 +2,7 @@ package org.rcisoft.sys.user.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.StringUtils;
 import org.rcisoft.business.synchronizationtime.entity.SynchronizationTime;
 import org.rcisoft.business.synchronizationtime.service.SynchronizationTimeService;
@@ -246,20 +247,27 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
     @Override
-    public String queryAllRoleById(String userId) {
-        List<String> roles = sysUserMapper.queryAllRoleById(userId);
+    public Object queryAllRoleById(CurUser curUser) {
+        List<String> roles = sysUserMapper.queryAllRoleById(curUser);
         StringBuffer sb = new StringBuffer();
-        for(String role : roles){
-            sb.append(role+",");
-        }
-        String str1 =  sb.toString().substring(0,sb.toString().length() - 1);
-        String [] strs = str1.split(",");
-        Set roleSet = new HashSet();
-        for(String s : strs){
-            roleSet.add(s);
+        if(roles != null && roles.size() > 0){
+            for(String role : roles){
+                sb.append(role+",");
+            }
+            String str1 =  sb.toString().substring(0,sb.toString().length() - 1);
+            String [] strs = str1.split(",");
+            Set roleSet = new HashSet();
+            for(String s : strs){
+                roleSet.add(s);
+            }
+            return StringUtils.join(roleSet.toArray(), ",");
+
+        }else {
+            Map<String,Object> map = new HashedMap();
+            map.put("massage","用户未启用或无权限");
+            map.put("code",400);
+            return map;
         }
-        String allRole = StringUtils.join(roleSet.toArray(), ",");
-        return allRole;
     }
 
     @Override