修改接口

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

@@ -206,7 +206,7 @@ public class SysRoleServiceImpl implements SysRoleService {
         //获取所有主管理员
         List<CorpGetManager> userMainList = cotactApiRequestClient.corpGetManager(curUser.getCorpId(),"1");
         if (userMainList != null && userMainList.size() > 0){
-            userMainList = this.accountIdToBusinessId(userMainList);
+            userMainList = this.accountIdToBusinessId(userMainList,curUser.getCorpId());
             List<UserRoleDTO> userRoleDTOList = setUserRole(userMainList,mRId);
             //插入s_r_user_role
             sysRoleRepository.addUserRole(userRoleDTOList);
@@ -223,7 +223,7 @@ public class SysRoleServiceImpl implements SysRoleService {
         initAddSubAdminDTO.setRPrivilege("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-NULL,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");
         initAddSubAdminDTO.setType("1");
         initAddSubAdminDTO.setCorpId(curUser.getCorpId());
-        initAddSubAdminDTO.setRType("0");
+        initAddSubAdminDTO.setRType("1");
         //设置s_role_menu表插入参数值
 //        List<String> menuIds = new ArrayList<String>(MenuMap.menuMap.values());
         List<RoleMenuDTO> subRoleMenuDTOs = setRoleMenu(menuIds,sRId);
@@ -236,7 +236,7 @@ public class SysRoleServiceImpl implements SysRoleService {
         //设置s_r_user_role表插入参数值
         List<CorpGetManager> userSubMainList = cotactApiRequestClient.corpGetManager(curUser.getCorpId(),"2");
         if (userSubMainList != null && userSubMainList.size() > 0){
-            userSubMainList = this.accountIdToBusinessId(userSubMainList);
+            userSubMainList = this.accountIdToBusinessId(userSubMainList,curUser.getCorpId());
             List<UserRoleDTO> userSubRoleDTOList = setUserRole(userSubMainList,sRId);
             //插入s_r_user_role表
             sysRoleRepository.addUserRole(userSubRoleDTOList);
@@ -307,13 +307,13 @@ public class SysRoleServiceImpl implements SysRoleService {
      * @param MainList
      * @return
      */
-    List<CorpGetManager> accountIdToBusinessId(List<CorpGetManager> MainList){
+    List<CorpGetManager> accountIdToBusinessId(List<CorpGetManager> MainList,String corpId){
         StringBuffer sb = new StringBuffer();
         for(CorpGetManager user : MainList){
             sb.append(user.getAccountId()+",");
         }
         String accountId = sb.toString().substring(0,sb.toString().length() - 1);
-        List<SysUser> businessId = sysUserMapper.getBusinessIdByAccountId(accountId);
+        List<SysUser> businessId = sysUserMapper.getBusinessIdByAccountId(accountId,corpId);
 
         if(businessId != null && businessId.size() > 0){
             for(SysUser sysUser:businessId){

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

@@ -275,7 +275,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param accountId
      * @return
      */
-    @Select("select * from s_user where account_id in(${accountId})")
+    @Select("select * from s_user where account_id in(${accountId}) and corp_id = #{corpId}")
     @ResultMap(value = "BaseResultMap")
-    List<SysUser> getBusinessIdByAccountId(@Param("accountId") String accountId);
+    List<SysUser> getBusinessIdByAccountId(@Param("accountId") String accountId ,@Param("corpId")String corpId);
 }