feature-wzb :bug修复

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -840,7 +840,7 @@
 		left join t_employee_info b on a.EMP_ID = b.id
 		LEFT JOIN (
 		SELECT
-		t1.EMP_ID ,t1.CONTRACT_PARTY,t1.IN_USE
+		t1.EMP_ID ,t1.CONTRACT_PARTY,t1.IN_USE,t1.DEPT_NO
 		FROM
 		t_employee_contract_info t1
 		INNER JOIN ( SELECT EMP_ID, MAX( CREATE_TIME ) CREATE_TIME FROM t_employee_contract_info GROUP BY EMP_ID ) t2 ON t2.EMP_ID = t1.EMP_ID
@@ -849,7 +849,7 @@
 		t1.CONTRACT_TYPE = '1'
 		AND
 	    t1.IN_USE='0'
-		) AS t ON t.EMP_ID = a.EMP_ID
+		) AS t ON t.EMP_ID = a.EMP_ID AND a.DEPT_NO =t.DEPT_NO
 		LEFT JOIN sys_area a1 on a1.id=b.ID_PROVINCE
 		LEFT JOIN sys_area a2 on a2.id=b.ID_CITY
 		LEFT JOIN sys_area a3 on a3.id=b.ID_TOWN
@@ -883,7 +883,7 @@
 		left join t_employee_info b on a.EMP_ID = b.id
 		LEFT JOIN (
 		SELECT
-		t1.EMP_ID ,t1.CONTRACT_PARTY,t1.IN_USE
+		t1.EMP_ID ,t1.CONTRACT_PARTY,t1.IN_USE,t1.DEPT_NO
 		FROM
 		t_employee_contract_info t1
 		INNER JOIN ( SELECT EMP_ID, MAX( CREATE_TIME ) CREATE_TIME FROM t_employee_contract_info GROUP BY EMP_ID ) t2 ON t2.EMP_ID = t1.EMP_ID
@@ -892,13 +892,14 @@
 		t1.CONTRACT_TYPE = '1'
 		AND
 		t1.IN_USE='0'
-		) AS t ON t.EMP_ID = a.EMP_ID
+		) AS t ON t.EMP_ID = a.EMP_ID AND a.DEPT_NO=t.DEPT_NO
 		<where>
 			a.DELETE_FLAG = '0'
 			<include refid="exportTEmployeeProject_where"/>
 			<if test="tEmployeeProject.authSql != null and tEmployeeProject.authSql.trim() != ''">
 				${tEmployeeProject.authSql}
 			</if>
+
 		</where>
 	</select>
 

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml

@@ -211,7 +211,7 @@
 			</if>
 		ORDER BY
 		field(a.HANDLE_FLAG,0,1) asc,
-		CREATE_TIME desc
+		CREATE_TIME asc
 	</select>
 	<select id="selectByEmpIdcard" resultType="Integer">
 		SELECT count(*)
@@ -355,7 +355,7 @@
 		</if>
 		ORDER BY
 		field(a.HANDLE_FLAG,0,1) asc,
-		a.CREATE_TIME desc
+		a.CREATE_TIME asc desc
 	</select>
 	<!--tEmployeeInfo导出查询count改造 fxj 2022-11-03-->
 	<select id="noPageCountDiy" resultType="java.lang.Integer">
@@ -418,7 +418,7 @@
 		</if>
 		ORDER BY
 		field(a.HANDLE_FLAG,0,1) asc,
-		a.CREATE_TIME desc
+		a.CREATE_TIME asc
 	</select>
 	<select id="selectByIdd" resultType="String">
 		SELECT a.AREA_NAME