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,