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

Merge remote-tracking branch 'origin/main' into main

main
SondonYong 2025-12-09 09:14:55 +08:00
parent 25cf91ba6b 4856ab3b5e
commit 3299a56368
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,9 +56,7 @@ public class UserQueryExe {
userE.dataProcessingRights(AuthContext.getTenantId(), params); userE.dataProcessingRights(AuthContext.getTenantId(), params);
PageResponse<UserDO> pageResponse = userRepository.listPage(params); PageResponse<UserDO> pageResponse = userRepository.listPage(params);
List<UserCO> examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData()); List<UserCO> examCenterCOS = userCoConvertor.converDOsToCOs(pageResponse.getData());
if(CollUtil.isNotEmpty(examCenterCOS)){
examCenterCOS.forEach(this::desensitize);
}
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
} }
@ -74,11 +72,7 @@ public class UserQueryExe {
Map<String, Object> params = PageQueryHelper.toHashMap(userQryCmd); Map<String, Object> params = PageQueryHelper.toHashMap(userQryCmd);
List<UserDO> imgFilesDOList = userRepository.listAll(params); List<UserDO> imgFilesDOList = userRepository.listAll(params);
List<UserCO> imgFilesCOList = userCoConvertor.converDOsToCOs(imgFilesDOList); List<UserCO> imgFilesCOList = userCoConvertor.converDOsToCOs(imgFilesDOList);
//手机号脱敏
//身份照脱敏
if(CollUtil.isNotEmpty(imgFilesCOList)){
imgFilesCOList.forEach(this::desensitize);
}
return MultiResponse.of(imgFilesCOList); return MultiResponse.of(imgFilesCOList);
} }
@ -93,7 +87,6 @@ public class UserQueryExe {
UserDO userDO = userRepository.getInfoById(id); UserDO userDO = userRepository.getInfoById(id);
UserCO userCO = new UserCO(); UserCO userCO = new UserCO();
BeanUtils.copyProperties(userDO, userCO); BeanUtils.copyProperties(userDO, userCO);
desensitize(userCO);
//如果是相关方流动人员，查找岗位部门 //如果是相关方流动人员，查找岗位部门
UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userCO.getId(),AuthContext.getTenantId()); UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userCO.getId(),AuthContext.getTenantId());
if(userCorpDO != null){ if(userCorpDO != null){
@ -140,26 +133,23 @@ public class UserQueryExe {
userDOQueryWrapper.in("id",collection); userDOQueryWrapper.in("id",collection);
List<UserDO> list = userRepository.list(userDOQueryWrapper); List<UserDO> list = userRepository.list(userDOQueryWrapper);
List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list); List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list);
userCOS.forEach(this::desensitize);
return userCOS; return userCOS;
} }
public List<UserCO> getUserList() { public List<UserCO> getUserList() {
List<UserDO> list = userRepository.list(); List<UserDO> list = userRepository.list();
List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list); List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list);
userCOS.forEach(this::desensitize);
return userCOS; return userCOS;
} }
private void desensitize(UserCO userCO) { // private void desensitize(UserCO userCO) {
userCO.setUserIdCard(DesensitizationUtils.idCardDesensitize(userCO.getUserIdCard())); // userCO.setUserIdCard(DesensitizationUtils.idCardDesensitize(userCO.getUserIdCard()));
userCO.setPhone(DesensitizationUtils.mobileDesensitize(userCO.getPhone())); // userCO.setPhone(DesensitizationUtils.mobileDesensitize(userCO.getPhone()));
} // }
public UserCO getInfoByUserId(Long aLong) { public UserCO getInfoByUserId(Long aLong) {
UserDO byId = userRepository.getById(aLong); UserDO byId = userRepository.getById(aLong);
UserCO userCO = userCoConvertor.converDOToCO(byId); UserCO userCO = userCoConvertor.converDOToCO(byId);
desensitize(userCO);
return userCO; return userCO;
} }
@ -192,7 +182,6 @@ public class UserQueryExe {
UserDO userDO = userRepository.getInfoById(id); UserDO userDO = userRepository.getInfoById(id);
UserCO userCO = new UserCO(); UserCO userCO = new UserCO();
BeanUtils.copyProperties(userDO, userCO); BeanUtils.copyProperties(userDO, userCO);
desensitize(userCO);
return SingleResponse.of(userCO); return SingleResponse.of(userCO);
} }
@ -210,9 +199,7 @@ public class UserQueryExe {
userE.dataProcessingRights(AuthContext.getTenantId(), params); userE.dataProcessingRights(AuthContext.getTenantId(), params);
PageResponse<UserDO> pageResponse = userRepository.listXgf(params); PageResponse<UserDO> pageResponse = userRepository.listXgf(params);
List<UserXmfCO> userXmfCOList = userCoConvertor.converDOsToXgfCOs(pageResponse.getData()); List<UserXmfCO> userXmfCOList = userCoConvertor.converDOsToXgfCOs(pageResponse.getData());
// if(CollUtil.isNotEmpty(userXmfCOList)){
// userXmfCOList.forEach(this::desensitize);
// }
return PageResponse.of(userXmfCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(userXmfCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
} }
} }

6
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
View File

@ -91,14 +91,14 @@ public class CorpInfoCO extends ClientObject {
private String contacts; private String contacts;
//主要负责人手机号 //主要负责人手机号
@ApiModelProperty(value = "主要负责人手机号") @ApiModelProperty(value = "主要负责人手机号")
@MobilePhoneMask // @MobilePhoneMask
private String contactsPhone; private String contactsPhone;
//安全负责人 //安全负责人
@ApiModelProperty(value = "安全负责人") @ApiModelProperty(value = "安全负责人")
private String safetyName; private String safetyName;
//安全负责人手机号 //安全负责人手机号
@ApiModelProperty(value = "安全负责人手机号") @ApiModelProperty(value = "安全负责人手机号")
@MobilePhoneMask // @MobilePhoneMask
private String safetyPhone; private String safetyPhone;
//是否规模以上,1:是,0:否 //是否规模以上,1:是,0:否
@ApiModelProperty(value = "是否规模以上,1:是,0:否") @ApiModelProperty(value = "是否规模以上,1:是,0:否")
@ -125,7 +125,7 @@ public class CorpInfoCO extends ClientObject {
private String lrName; private String lrName;
//法人手机号 //法人手机号
@ApiModelProperty(value = "法人手机号") @ApiModelProperty(value = "法人手机号")
@MobilePhoneMask // @MobilePhoneMask
private String lrMobile; private String lrMobile;
//行业分类 //行业分类
@ApiModelProperty(value = "行业分类") @ApiModelProperty(value = "行业分类")