zcloud_gbs
/
zcloud_gbs_basic_info_gwj
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改账户管理列表查询bug 

修改部门管理bug
dev_sys_config818
zhangyue 2026-08-12 16:55:06 +08:00
parent cc24ca0c8a
commit 2ef177621e
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -96,7 +96,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
if(params.get("exCludeSelf") != null && (Integer) params.get("exCludeSelf") == 1){ if(params.get("exCludeSelf") != null && (Integer) params.get("exCludeSelf") == 1){
queryWrapper.ne("id", AuthContext.getTenantId()); 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 if (params.get("enterpriseTypeList") != null
&& params.get("enterpriseTypeList") instanceof List){ && params.get("enterpriseTypeList") instanceof List){
List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList"); List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");