Browse Source

modify:

1. 用户同步修改;
tags/24110101
WendyYang 1 month ago
parent
commit
deb70d205c
4 changed files with 8 additions and 1 deletions
  1. +2
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ExistsSqlConst.java
  2. +3
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java
  3. +1
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java
  4. +2
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java

+ 2
- 0
hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ExistsSqlConst.java View File

@@ -29,4 +29,6 @@ public class ExistsSqlConst {

public static final String MEETING_INNER_PROJECT_EXISTS_MEETING = "select 1 from meeting m where meeting_inner_project.meeting_id = m.id ";

public static final String USER_EXISTS_EXPERT_USER = "select 1 from nd_expert_user_full_info neufi where neufi.user_id = nd_user_info.id ";

}

+ 3
- 1
hz-pm-api/src/main/java/com/hz/pm/api/user/manage/SyncMhUserOrgManage.java View File

@@ -12,6 +12,7 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hz.pm.api.common.model.constant.ExistsSqlConst;
import com.hz.pm.api.common.util.BizUtils;
import com.hz.pm.api.expert.entity.ExpertUserFullInfo;
import com.hz.pm.api.expert.service.IExpertUserFullInfoService;
@@ -162,7 +163,8 @@ public class SyncMhUserOrgManage {
}
if (syncDateTime == null) {
Wrapper<UserInfo> delQuery = Wrappers.lambdaQuery(UserInfo.class)
.lt(UserInfo::getSyncTime, now.minusSeconds(1));
.lt(UserInfo::getSyncTime, now.minusSeconds(1))
.notExists(ExistsSqlConst.USER_EXISTS_EXPERT_USER);
userInfoService.remove(delQuery);
}
} else {


+ 1
- 0
hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java View File

@@ -312,6 +312,7 @@ public class UserInfoManage {
resUserDetail.setMhUnitId(userInfo.getMhUnitId());
resUserDetail.setUnitStrip(userDetail.getUnitStrip());
resUserDetail.setMhUnitName(userInfo.getMhUnitName());
resUserDetail.setMhUserId(userInfo.getMhUserId());

// 装配用户角色信息列表
List<UserRole> userRoleList = userRoleService.listByUserId(userDetail.getUserId());


+ 2
- 0
hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java View File

@@ -72,4 +72,6 @@ public class ResUserDetailVO {
@ApiModelProperty("是否是区县信创办用户")
private Boolean isCountyXcbUser;

private String mhUserId;

}

Loading…
Cancel
Save