lyhzzz 1 год назад
Родитель
Сommit
7d2032cd2d

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/JyPlatformServiceImpl.java

@@ -78,7 +78,7 @@ public class JyPlatformServiceImpl extends ServiceImpl<IJyPlatformMapper, JyPlat
             }
             jyPlatform = new JyPlatform();
             jyUser = jyUserService.getByIdCard(param.getIdCard());
-            if(jyUser != null && (jyUser.getPlatformId() != null || jyUser.getIsJm() == 0)){
+            if(jyUser != null && jyUser.getPlatformId() != null  ){
                 throw new BusinessException(ResultCode.ID_CARD_EXIT);
             }
 

+ 4 - 0
src/main/java/com/fdkankan/manage/service/impl/JyUserPlatformServiceImpl.java

@@ -87,6 +87,10 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
     public Object pageList(JyUserPlatformParam param) {
         SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
         if(byId.getRoleId() != 1L ){
+            Integer loginPlatformId = getLoginPlatformId();
+            if(loginPlatformId == null){
+                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
+            }
             param.setPlatformId(getLoginPlatformId());
         }
         Page<JyUserPlatformVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);