单个编辑，手机号校验

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

@@ -396,15 +396,6 @@
 				<if test="tEmployeeInfo.contactAddress != null and tEmployeeInfo.contactAddress.trim() != ''">
 					AND a.CONTACT_ADDRESS = #{tEmployeeInfo.contactAddress}
 				</if>
-				<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
-					AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
-				</if>
-				<if test="tEmployeeInfo.deptName != null and tEmployeeInfo.deptName.trim() != ''">
-					AND b.DEPT_NAME like concat('%',#{tEmployeeInfo.deptName},'%')
-				</if>
-				<if test="tEmployeeInfo.deptNo != null and tEmployeeInfo.deptNo.trim() != ''">
-					AND b.DEPT_NO = #{tEmployeeInfo.deptNo}
-				</if>
 			</if>
 		</if>
 	</sql>
@@ -423,21 +414,33 @@
 
 	<!-- hgw 分页查询 -->
 	<select id="getLeavePage" resultMap="tEmployeeExportMap">
-		SELECT
-		a.ID,
-		<include refid="Base_Export_List"/>
-		,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
-		,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
-		,a.LEAVE_TIME
-		,a.LEAVE_USER_NAME
-		,a.LEAVE_USER
-		,a.LEAVE_REASON
-		from t_employee_info a
-		left join t_employee_project b on a.id = b.EMP_ID
-		where a.DELETE_FLAG = '0'
-			<include refid="employeeInfo_where"/>
-		${sql}
-		group by a.id order by a.CREATE_TIME desc
+		SELECT * from (
+			SELECT
+			a.ID,
+			<include refid="Base_Export_List"/>
+			,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
+			,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
+			,a.LEAVE_TIME
+			,a.LEAVE_USER_NAME
+			,a.LEAVE_USER
+			,a.LEAVE_REASON
+			from t_employee_info a
+			left join t_employee_project b on a.id = b.EMP_ID
+			where a.DELETE_FLAG = '0'
+				<include refid="employeeInfo_where"/>
+			${sql}
+			group by a.id order by a.CREATE_TIME desc
+		) b
+		where 1=1
+		<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
+			AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
+		</if>
+		<if test="tEmployeeInfo.deptName != null and tEmployeeInfo.deptName.trim() != ''">
+			AND b.DEPT_NAME like concat('%',#{tEmployeeInfo.deptName},'%')
+		</if>
+		<if test="tEmployeeInfo.deptNo != null and tEmployeeInfo.deptNo.trim() != ''">
+			AND b.DEPT_NO = #{tEmployeeInfo.deptNo}
+		</if>
 	</select>
 
 	<!-- hgw list查询 -->
@@ -543,14 +546,15 @@
 
 	<!--tEmployeeInfo离职档案导出查询-->
 	<select id="getTEmployeeLeaveExportList" resultMap="tEmployeeExportMap">
+		select * from (
 		SELECT
-			<include refid="Base_Export_List"/>
-			,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
-			,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
-			,a.LEAVE_TIME
-			,a.LEAVE_USER
-			,a.LEAVE_USER_NAME
-			,a.LEAVE_REASON
+		<include refid="Base_Export_List"/>,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
+		,
+		GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
+		,a.LEAVE_TIME
+		,a.LEAVE_USER
+		,a.LEAVE_USER_NAME
+		,a.LEAVE_REASON
 		from t_employee_info a
 		left join t_employee_project b on a.id = b.EMP_ID
 		<where>
@@ -558,6 +562,17 @@
 			<include refid="employeeInfo_where"/>
 		</where>
 		GROUP BY a.id
+		) b
+		where 1=1
+		<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
+			AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
+		</if>
+		<if test="tEmployeeInfo.deptName != null and tEmployeeInfo.deptName.trim() != ''">
+			AND b.DEPT_NAME like concat('%',#{tEmployeeInfo.deptName},'%')
+		</if>
+		<if test="tEmployeeInfo.deptNo != null and tEmployeeInfo.deptNo.trim() != ''">
+			AND b.DEPT_NO = #{tEmployeeInfo.deptNo}
+		</if>
 	</select>
 
 	<!-- 获取当日最大的编码 -->