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

获取企业列表增加企业类型查询

main
zhaokai 2026-01-19 10:47:18 +08:00
parent 0e2a59c9b6
commit b4342154b6
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
View File

@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* web-client * web-client
@ -53,5 +55,10 @@ public class UserPageQry extends PageQuery {
private String menuPath; private String menuPath;
private Integer noMain; private Integer noMain;
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "inType")
private List<Integer> inType;
@ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType")
private Integer enterpriseType;
} }

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

@ -24,6 +24,7 @@ import com.jjb.saas.system.client.role.response.RoleCO;
import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.facade.UserFacade;
import com.jjb.saas.system.client.user.request.*; import com.jjb.saas.system.client.user.request.*;
import com.jjb.saas.system.client.user.response.UserDetailCO; import com.jjb.saas.system.client.user.response.UserDetailCO;
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.domain.enums.MenuEnum;
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.enums.UserTypeEnum;
@ -130,14 +131,28 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
params.remove("inDepartmentId"); params.remove("inDepartmentId");
} }
} }
IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
if (CollUtil.isNotEmpty(enterpriseType)) {
params.remove("enterpriseType");
queryWrapper.in("c.type", enterpriseType);
queryWrapper.eq("c.use_flag", 1);
}
List<Integer> inType = (List<Integer>) params.get("inType");
if (CollUtil.isNotEmpty(inType)) {
queryWrapper.in("c.type", inType);
queryWrapper.eq("c.use_flag", 1);
}
params.remove("inType");
IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u."); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u.");
queryWrapper.eq("u.delete_enum", "FALSE"); queryWrapper.eq("u.delete_enum", "FALSE");
if (!ObjectUtils.isEmpty(params.get("noMain"))) { if (!ObjectUtils.isEmpty(params.get("noMain"))) {
queryWrapper.apply("u.id != u.corpinfo_id"); queryWrapper.apply("u.id != u.corpinfo_id");
} }
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
IPage<UserDO> result = userMapper.pageByNopermission(iPage, queryWrapper); IPage<UserDO> result = userMapper.pageByNopermission(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords()); return PageHelper.pageToResponse(result, result.getRecords());