|
@@ -23,6 +23,7 @@
|
|
|
<result column="demission_date_" property="demissionDate"/>
|
|
|
<result column="contact_address_" property="contactAddress"/>
|
|
|
<result column="postal_code_" property="postalCode"/>
|
|
|
+ <result column="dept_id_" property="deptId"/>
|
|
|
<result column="dept_ids_" property="deptIds"/>
|
|
|
<result column="post_ids_" property="postIds"/>
|
|
|
<result column="post_dept_ids_" property="postDeptIds"/>
|
|
@@ -75,9 +76,9 @@
|
|
|
-->
|
|
|
INSERT INTO employee
|
|
|
(user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
|
|
|
- entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_ids_,post_ids_,post_dept_ids_)
|
|
|
+ entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_id_,dept_ids_,post_ids_,post_dept_ids_)
|
|
|
VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
|
|
|
- #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptIds},#{postIds},#{postDeptIds})
|
|
|
+ #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptId},#{deptIds},#{postIds},#{postDeptIds})
|
|
|
</insert>
|
|
|
<insert id="batchAddEmployeeRole">
|
|
|
INSERT INTO sys_user_role(user_id_,role_id_) values
|
|
@@ -136,6 +137,9 @@
|
|
|
<if test="demissionDate != null">
|
|
|
demission_date_ = #{demissionDate},
|
|
|
</if>
|
|
|
+ <if test="deptId != null">
|
|
|
+ dept_id_ = #{deptId},
|
|
|
+ </if>
|
|
|
<if test="deptIds != null">
|
|
|
dept_ids_ = #{deptIds},
|
|
|
</if>
|
|
@@ -201,6 +205,7 @@
|
|
|
<result property="contactAddress" column="contact_address_"/>
|
|
|
<result property="postalCode" column="postal_code_"/>
|
|
|
<result property="organIdStr" column="organ_id_str_"/>
|
|
|
+ <result property="deptId" column="dept_id_"/>
|
|
|
<result property="deptIds" column="dept_ids_"/>
|
|
|
<result property="postIds" column="post_ids_"/>
|
|
|
<result property="postDeptIds" column="post_dept_ids_"/>
|
|
@@ -214,7 +219,7 @@
|
|
|
<select id="queryEmployByOrganId" resultMap="EmployeeDto">
|
|
|
SELECT ue.*,ue.organ_id_ organ_id_str_,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.contact_address_,e.postal_code_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
|
|
|
+ e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_,e.dept_id_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
|
|
|
FROM employee e
|
|
|
LEFT JOIN sys_user su ON e.user_id_ = su.id_
|
|
|
<if test="roleId != null">
|