java110 лет назад: 5
Родитель
Сommit
2b2bcb3aa1

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java

@@ -22,6 +22,7 @@ public class OrgStaffRelDto extends PageDto implements Serializable {
     private String staffName;
     private String[] staffIds;
     private String relCd;
+    private String relCdName;
     private String departmentId;
     private String departmentName;
     private String companyId;
@@ -146,4 +147,12 @@ public class OrgStaffRelDto extends PageDto implements Serializable {
     public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
+
+    public String getRelCdName() {
+        return relCdName;
+    }
+
+    public void setRelCdName(String relCdName) {
+        this.relCdName = relCdName;
+    }
 }

+ 5 - 2
java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml

@@ -77,10 +77,13 @@
     <select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
         select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id
         bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId,
-        uu.name staffName,uo.org_name departmentName,uo.org_id departmentId
-        from u_org_staff_rel t,u_org uo,u_user uu
+        uu.name staffName,uo.org_name departmentName,uo.org_id departmentId,td.`name` relCdName
+        from u_org_staff_rel t,u_org uo,u_user uu,t_dict td
         where t.org_id = uo.org_id
         and t.staff_id = uu.user_id
+        and t.rel_cd = td.status_cd
+        and td.table_name = 'u_org_staff_rel'
+        and td.table_columns = 'rel_cd'
 
         <if test='statusCd ==null or statusCd != "1"'>
             and uu.status_cd = '0'