修改账户管理列表查询bug

修改部门管理bug

web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java

@@ -35,6 +35,7 @@ import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.util.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
@@ -239,6 +240,9 @@ public class UserQueryExe {
         SSOUser ssoUser = AuthContext.getCurrentUser();
         Long id = ssoUser.getUserId();
         UserDO userDO = userRepository.getInfoById(id);
+        if (userDO == null || ObjectUtils.isEmpty(userDO.getId())){
+            throw new BizException("该未完善基本信息，请联系管理员进行基础信息生成。");
+        }
         UserCO userCO = new UserCO();
         BeanUtils.copyProperties(userDO, userCO);
         try{

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java

@@ -134,5 +134,8 @@ public class CorpInfoPageQry extends PageQuery {
     @ApiModelProperty(value = "排除自己的企业,1：排除", name = "exCludeSelf")
     private Integer exCludeSelf;
 
+
+    private String menuId;
+
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -96,7 +96,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         if(params.get("exCludeSelf") != null && (Integer) params.get("exCludeSelf") == 1){
             queryWrapper.ne("id", AuthContext.getTenantId());
         }
-
+        if(!ObjectUtils.isEmpty(params.get("menuId"))){
+            queryWrapper.in("type",  zcloudTenantTypeConfigFacade.listTypeByMenuId(Long.valueOf(params.get("menuId").toString())));
+        }
         if (params.get("enterpriseTypeList") != null
                 && params.get("enterpriseTypeList") instanceof List){
             List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");