zhuxinru/cid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:同步利元亨用户岗位数据

Browse Source
This commit is contained in:
zhuxinru
2026-02-02 17:58:13 +08:00
parent 38048f94e0
commit 17288f9f21
12 changed files with 171 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/config/UserApiProperties.java
View File

@@ -14,4 +14,6 @@ public class UserApiProperties {
*/
private String defaultPassword = "honeycom@2025.";
private String defaultLyricPassword = "lyric@2026.";
}

4
honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/controller/SysUserController.java
View File

@@ -87,8 +87,8 @@ public class SysUserController {
@Inner(false)
@Operation(summary = "分页查询" , description = "分页查询" )
@GetMapping("/page/inner" )
public R<IPage<SysUserPageQueryVO>> getSysUserPageInner(@ParameterObject Page<SysUserEntity> page, @ParameterObject SysUserPageQueryDTO sysUser) {
return R.ok(sysUserService.page(page, sysUser));
public R<IPage<SysUserVO>> getSysUserPageInner(@ParameterObject Page<SysUserEntity> page, @ParameterObject SysUserPageQueryDTO sysUser) {
return R.ok(sysUserService.pageInner(page, sysUser));
}
/**

2
honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/SysUserService.java
View File

@@ -32,6 +32,8 @@ public interface SysUserService extends IService<SysUserEntity> {
IPage<SysUserPageQueryVO> page(Page<SysUserEntity> page, SysUserPageQueryDTO sysUser);
IPage<SysUserVO> pageInner(Page<SysUserEntity> page, SysUserPageQueryDTO sysUser);
void changeStatus(SysUserChangeStatusDTO sysUser);
List<SysUserVO> findLikeUsername(String username);

2
honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/impl/SysHrSyncUserServiceImpl.java
View File

@@ -185,7 +185,7 @@ public class SysHrSyncUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser
public Boolean batchAdd(List<TenantUserDto> tenantUserDtoList) {
List<SysUserEntity> sysUserEntitySaveList = new ArrayList<>();
List<SysPersonSaveOrUpdateDTO> sysPersonSaveOrUpdateDTOList = new ArrayList<>();
String password = ENCODER.encode(userApiProperties.getDefaultPassword());
String password = ENCODER.encode(userApiProperties.getDefaultLyricPassword());
for (TenantUserDto tenantUserDto : tenantUserDtoList) {
SysUserEntity sysUserEntity = new SysUserEntity();
if(tenantUserDto.getUserId()!=null){

48
honeycom-user/honeycom-user-biz/src/main/java/com/honeycombis/honeycom/user/service/impl/SysUserServiceImpl.java
View File

@@ -264,6 +264,54 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
return pageData.convert(SysUserPageQueryVO::new);
}
@Override
public IPage<SysUserVO> pageInner(Page<SysUserEntity> page, SysUserPageQueryDTO sysUser) {
if (Objects.isNull(page)) {
throw new HoneycomException(ErrorType.PARAM_ERROR.getCode());
}
LambdaQueryWrapper<SysUserEntity> queryWrapper = new LambdaQueryWrapper<>();
if (!Objects.isNull(sysUser)) {
if (ObjectUtil.isNotNull(sysUser.getUserId())) {
queryWrapper.like(SysUserEntity::getUserId, sysUser.getUserId());
}
if (ObjectUtil.isNotNull(sysUser.getUserName())) {
queryWrapper.like(SysUserEntity::getUsername, sysUser.getUserName());
}
if (StringUtils.isNotBlank(sysUser.getPhone())) {
queryWrapper.like(SysUserEntity::getPhone, sysUser.getPhone());
}
if (StringUtils.isNotBlank(sysUser.getNickname())) {
queryWrapper.like(SysUserEntity::getNickname, sysUser.getNickname());
}
if (StringUtils.isNotBlank(sysUser.getEmail())) {
queryWrapper.like(SysUserEntity::getEmail, sysUser.getEmail());
}
if (StringUtils.isNotBlank(sysUser.getStatus())) {
queryWrapper.like(SysUserEntity::getStatus, sysUser.getStatus());
}
if (!Objects.isNull(sysUser.getStartCreateTime())) {
queryWrapper.ge(SysUserEntity::getCreateTime, sdf.format(new Date(sysUser.getStartCreateTime())));
}
if (!Objects.isNull(sysUser.getEndCreateTime())) {
queryWrapper.le(SysUserEntity::getCreateTime, sdf.format(new Date(sysUser.getEndCreateTime())));
}
if (!Objects.isNull(sysUser.getStartUpdateTime())) {
queryWrapper.ge(SysUserEntity::getUpdateTime, sdf.format(new Date(sysUser.getStartUpdateTime())));
}
if (!Objects.isNull(sysUser.getEndUpdateTime())) {
queryWrapper.le(SysUserEntity::getUpdateTime, sdf.format(new Date(sysUser.getEndUpdateTime())));
}
}
Page<SysUserEntity> pageData = this.page(page, queryWrapper);
if (Objects.isNull(pageData)) {
throw new HoneycomException(UserErrorType.QUERY_USER_PAGE_ERROR.getCode());
}
return pageData.convert(SysUserVO::new);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(SysUserChangeStatusDTO sysUser) {