From f2599399d03cd63683ba1297bc20a38739ee83c6 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Fri, 7 Mar 2025 16:41:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=88=92=E7=BA=BF?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docus/server/archive/converter/MzsyUserInfoConverter.java | 2 +- .../java/com/docus/server/mzsy/entity/MzsyUserInfoView.java | 2 +- src/main/resources/mapper/MzsyUserInfoViewMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/docus/server/archive/converter/MzsyUserInfoConverter.java b/src/main/java/com/docus/server/archive/converter/MzsyUserInfoConverter.java index 9f4df4d..b9711dc 100644 --- a/src/main/java/com/docus/server/archive/converter/MzsyUserInfoConverter.java +++ b/src/main/java/com/docus/server/archive/converter/MzsyUserInfoConverter.java @@ -33,7 +33,7 @@ public class MzsyUserInfoConverter { 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/mzsy/entity/MzsyUserInfoView.java b/src/main/java/com/docus/server/mzsy/entity/MzsyUserInfoView.java index 2ceda8d..736e5fd 100644 --- a/src/main/java/com/docus/server/mzsy/entity/MzsyUserInfoView.java +++ b/src/main/java/com/docus/server/mzsy/entity/MzsyUserInfoView.java @@ -14,7 +14,7 @@ public class MzsyUserInfoView { @ApiModelProperty("员工姓名") private String FEMPNAME; @ApiModelProperty("所属科室") - private String FIP_DEPTID; + private String FIPDEPTID; @ApiModelProperty("是否可用 是/否") private String FISAVAILABLE; @ApiModelProperty("角色 0-医生 1-护士 2-病案室 3-其他") diff --git a/src/main/resources/mapper/MzsyUserInfoViewMapper.xml b/src/main/resources/mapper/MzsyUserInfoViewMapper.xml index 09a5e82..9de8a31 100644 --- a/src/main/resources/mapper/MzsyUserInfoViewMapper.xml +++ b/src/main/resources/mapper/MzsyUserInfoViewMapper.xml @@ -9,7 +9,7 @@ SELECT paging.ID, paging.FEMPCODE, paging.FEMPNAME, - paging.FIP_DEPTID, + paging.FIP_DEPTID AS FIPDEPTID, paging.FISAVAILABLE, paging.FL FROM (SELECT ROW_NUMBER() OVER (ORDER BY ID) AS RowNumber,