Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/registration/domain/DepartRegistration.java

@@ -26,6 +26,7 @@ public class DepartRegistration extends BaseEntity {
     private String type;                //流程状态
     private String procInsId;
     private String processDefinitionId;
+    private String userId;
 
     @TableField(exist = false)
     private String dimissionProveUrl; //离职证明路径

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentRegistrationMapper.xml

@@ -121,7 +121,11 @@
         <include refid="Base_Column_List"></include>
         FROM `human_resources_enrollment_registration`  a
         LEFT JOIN sys_user su on a.user_id = su.id and su.del_flag = '0'
-        WHERE a.on_job_status = '离职'
+        LEFT JOIN human_resources_depart_registration hrdr ON hrdr.create_by_id = a.user_id
+        <where>
+            a.on_job_status = '离职'
+        and hrdr.depart_resignation_date &lt; CURDATE()
+        </where>
     </select>
     <select id="getAllUserIdInSuccess" resultType="java.lang.String">
         SELECT DISTINCT a.user_id