feature-wzb :bug修复

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

@@ -71,13 +71,13 @@
 		<if test="searchVo.unitName!= null">
 			AND a.UNIT_NAME = #{searchVo.unitName}
 		</if>
-		<if test="searchVo.unitNo!= null">
+		<if test="searchVo.unitNo!= null and searchVo.unitNo!=''" >
 			AND a.UNIT_NO = #{searchVo.unitNo}
 		</if>
 		<if test="searchVo.deptName!= null">
 			AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
 		</if>
-		<if test="searchVo.deptNo!= null">
+		<if test="searchVo.deptNo!= null and searchVo.deptNo!=''">
 			AND a.DEPT_NO =#{searchVo.deptNo}
 		</if>
 		<if test="searchVo.handleFlag!= null">
@@ -134,7 +134,7 @@
 			AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
 		</if>
 		<if test="searchVo.deptNo!= null">
-			AND a.DEPART_NO =#{searchVo.deptNo}
+			AND a.DEPT_NO =#{searchVo.deptNo}
 		</if>
 		<if test="searchVo.handleFlag!= null">
 			AND a.HANDLE_FLAG =#{searchVo.handleFlag}
@@ -188,6 +188,7 @@
 		where ((datediff(#{oo}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
 			or (datediff(#{pp}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
 		  and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3')
+		   and a.PROJECT_STATUS = 0
 		GROUP BY a.EMP_IDCARD,
 				 a.DEPT_NO
 	</select>