Explorar o código

平台机构未展示bug

dongxin hai 1 ano
pai
achega
aa2dc18cae

+ 3 - 1
platform/src/main/java/com/jzg/service/SysUserJzgInfoService.java

@@ -7,8 +7,10 @@ public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
 
     /**
      * 通过userId查询用户信息
+     *
      * @param userId
+     * @param sysCode
      * @return
      */
-    SysUserJzgInfo getUserByUserId(String userId);
+    SysUserJzgInfo getUserByUserId(String userId, String sysCode);
 }

+ 2 - 2
platform/src/main/java/com/jzg/service/impl/SysDeptServiceImpl.java

@@ -172,7 +172,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         if(!deptId.equals("")) {
             lqw.likeRight(SysDept::getRoute, deptId);
         }
-        lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, sysCode);
+        lqw.eq(StringUtils.isNotEmpty(sysCode),SysDept::getSystemCode, bySysCode.getSysCode());
         List<SysDept> sysDeptList = list(lqw);
 
         List<SysDeptVo> voDept = new ArrayList<>();
@@ -195,7 +195,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 item.setDivision(areaString.substring(0, areaString.length() - 1));
             }
             if(!Objects.isNull(item.getLeaderId())){
-                SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId());
+                SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(item.getLeaderId(),bySysCode.getSysCode());
                 if(!Objects.isNull(userByUserId)){
                     item.setLeaderName(userByUserId.getName());
                 }

+ 6 - 2
platform/src/main/java/com/jzg/service/impl/SysUserJzgInfoServiceImpl.java

@@ -11,8 +11,12 @@ import org.springframework.stereotype.Service;
 public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper, SysUserJzgInfo> implements SysUserJzgInfoService {
 
     @Override
-    public SysUserJzgInfo getUserByUserId(String userId) {
+    public SysUserJzgInfo getUserByUserId(String userId, String sysCode) {
         return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getUserId, userId));
+                .eq(SysUserJzgInfo::getUserId, userId)
+                .eq(SysUserJzgInfo::getSystemCode, sysCode)
+                .eq(SysUserJzgInfo::getIsEnable, 0)
+                .eq(SysUserJzgInfo::getIsDelete,0)
+        );
     }
 }