From 2fe2a06ee8ccb1c26670ed00e382ebc63f3fbefd Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Mon, 27 May 2024 16:20:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8B=E5=88=92=E7=BA=BF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/archive/converter/ZqDyRyUserInfoConverter.java | 2 +- .../archive/service/impl/ZqDyRyUserInfoSyncServiceImpl.java | 4 +++- .../com/docus/server/zqdyry/entity/ZqDyRyUserInfoView.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/docus/server/archive/converter/ZqDyRyUserInfoConverter.java b/src/main/java/com/docus/server/archive/converter/ZqDyRyUserInfoConverter.java index dc485cf..d68fb97 100644 --- a/src/main/java/com/docus/server/archive/converter/ZqDyRyUserInfoConverter.java +++ b/src/main/java/com/docus/server/archive/converter/ZqDyRyUserInfoConverter.java @@ -17,7 +17,7 @@ public class ZqDyRyUserInfoConverter { PowerUser user = new PowerUser(); user.setUserName(view.getFEMPCODE()); user.setName(view.getFEMPNAME()); - user.setDeptId(view.getFIP_DEPTID()); + user.setDeptId(view.getFIPDEPTID()); user.setEffective(enable); user.setEnabled(enable); user.setRoleId(roleId); diff --git a/src/main/java/com/docus/server/archive/service/impl/ZqDyRyUserInfoSyncServiceImpl.java b/src/main/java/com/docus/server/archive/service/impl/ZqDyRyUserInfoSyncServiceImpl.java index d2ec321..a470671 100644 --- a/src/main/java/com/docus/server/archive/service/impl/ZqDyRyUserInfoSyncServiceImpl.java +++ b/src/main/java/com/docus/server/archive/service/impl/ZqDyRyUserInfoSyncServiceImpl.java @@ -58,7 +58,8 @@ public class ZqDyRyUserInfoSyncServiceImpl implements UserInfoSyncService { if (Func.isNotEmpty(userInfoViews)) { // 目前视图是名称，将名称转换为科室id for (ZqDyRyUserInfoView userInfoView : userInfoViews) { - userInfoView.setFIP_DEPTID(deptNameIdMap.get(userInfoView.getFIP_DEPTID())); + String deptId = deptNameIdMap.get(userInfoView.getFIPDEPTID()); + userInfoView.setFIPDEPTID(deptId); } // 转换保存 List powerUsers = userInfoViews.stream() @@ -115,6 +116,7 @@ public class ZqDyRyUserInfoSyncServiceImpl implements UserInfoSyncService { powerUser.setName(iuPowerUser.getName()); powerUser.setEnabled(iuPowerUser.getEnabled()); powerUser.setEffective(iuPowerUser.getEffective()); + powerUser.setDeptId(iuPowerUser.getDeptId()); powerUser.setPowerDept(powerDept); powerUser.setPowerAttending(powerAttending); powerUser.setUpdateDate(nowDate); diff --git a/src/main/java/com/docus/server/zqdyry/entity/ZqDyRyUserInfoView.java b/src/main/java/com/docus/server/zqdyry/entity/ZqDyRyUserInfoView.java index 8a4895b..6f1755e 100644 --- a/src/main/java/com/docus/server/zqdyry/entity/ZqDyRyUserInfoView.java +++ b/src/main/java/com/docus/server/zqdyry/entity/ZqDyRyUserInfoView.java @@ -19,7 +19,7 @@ public class ZqDyRyUserInfoView { @ApiModelProperty("员工ID") private String FDCOID; @ApiModelProperty("所属科室id") - private String FIP_DEPTID; + private String FIPDEPTID; @ApiModelProperty("启用标记（如0停用1在用2废弃）") private String FISAVAILABLE; @ApiModelProperty("角色（1-医生，2-护士，3-其他医技）")