zouxuan 5 年 前
コミット
203679a898

+ 20 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -54,6 +54,26 @@ public class EmployeeDto {
     @ApiModelProperty(value = "部门名称",required = false)
     private List<String> organNameList;
 
+    private String contactAddress;
+
+    private String postalCode;
+
+    public String getContactAddress() {
+        return contactAddress;
+    }
+
+    public void setContactAddress(String contactAddress) {
+        this.contactAddress = contactAddress;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(String postalCode) {
+        this.postalCode = postalCode;
+    }
+
     public List<String> getRoleNames() {
         return roleNames;
     }

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -174,6 +174,8 @@
         <result property="jobNature" column="job_nature_"/>
         <result property="entryDate" column="entry_date_"/>
         <result property="demissionDate" column="demission_date_"/>
+        <result property="contactAddress" column="contact_address_"/>
+        <result property="postalCode" column="postal_code_"/>
         <collection property="roleNames" ofType="string" javaType="list">
             <result column="role_name_"/>
         </collection>
@@ -190,7 +192,7 @@
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
         SELECT ue.*,o.name_ organ_name_list_,o.id_ organ_id_list_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
-        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_
+        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
         <if test="roleId != null">