|
@@ -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">
|