1

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -90,6 +90,7 @@ public enum ResultCode  {
 
     UNQUINX_INDEX(60019, "违反唯一约束"),
     PHONE_EXIT(60020, "手机号已存在"),
+    PLATFORM_USER_ADDERROR(60021, "该用户身份为平台管理员，无法更改其平台，如需继续，请联系超级管理员更改平台管理员身份后再试"),
     ;
 
     private Integer code;

src/main/java/com/fdkankan/manage/service/impl/JyUserPlatformServiceImpl.java

@@ -60,6 +60,11 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         param.setPlatformId(loginPlatformId);
+        JyUser jyUser = jyUserService.getById(param.getId());
+        SysUser byId = sysUserService.getById(jyUser.getSysUserId());
+        if(byId.getRoleId() != 47L ){
+            throw new BusinessException(ResultCode.PLATFORM_USER_ADDERROR);
+        }
         this.bindPlatform(param.getId(),loginPlatformId);
     }
 
@@ -68,6 +73,11 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
         if(param.getId() == null || param.getPlatformId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        JyUser jyUser = jyUserService.getById(param.getId());
+        SysUser byId = sysUserService.getById(jyUser.getSysUserId());
+        if(byId.getRoleId() != 47L ){
+            throw new BusinessException(ResultCode.PLATFORM_USER_ADDERROR);
+        }
         this.bindPlatform(param.getId(),param.getPlatformId());
 
     }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -307,17 +307,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
-        if(byId.getRoleId() != 1L ){
+        if(byId.getRoleId() ==47L ){
             if(jyUser == null){
                 throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
             }
             param.setUserId(jyUser.getUserId());
-            if(byId.getRoleId() != 45L && byId.getRoleId() != 48L){
-                List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserId(jyUser.getId());
-                if(list.size() >0){
-                    List<String> numList = list.stream().filter(entity -> !(entity.getLookAuth()==0 && entity.getEditAuth() ==0)).map(JySceneUserAuth::getNum).collect(Collectors.toList());
-                    param.setAuthNumList(numList);
-                }
+            List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserId(jyUser.getId());
+            if(list.size() >0){
+                List<String> numList = list.stream().filter(entity -> !(entity.getLookAuth()==0 && entity.getEditAuth() ==0)).map(JySceneUserAuth::getNum).collect(Collectors.toList());
+                param.setAuthNumList(numList);
             }
         }
         if(byId.getRoleId() == 45L || byId.getRoleId() == 48L){