feature-wzb :bug修复

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java

@@ -31,7 +31,7 @@ public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetiremen
 
 	boolean changeHandleFlag(@Param("changeHandleFlagVo")ChangeHandleFlagVo changeHandleFlagVo);
 
-	int selectByEmpIdcard(@Param("empIdCard") String empIdCard);
+	int selectByEmpIdcard(@Param("empIdCard") String empIdCard,@Param("deptNo") String deptNo);
 
 	int add(@Param("tEmployeeRetirement") TEmployeeRetirement tEmployeeRetirement);
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeRetirementServiceImpl.java

@@ -70,7 +70,7 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
 		String pp=DateUtil.dateToString(DateUtil.stringToDate(LL));
 		List<TEmployeeRetirement> list = baseMapper.getBirthday(oo,pp);
 		for (TEmployeeRetirement tEmployeeRetirement : list) {
-			int i = baseMapper.selectByEmpIdcard(tEmployeeRetirement.getEmpIdcard());
+			int i = baseMapper.selectByEmpIdcard(tEmployeeRetirement.getEmpIdcard(),tEmployeeRetirement.getDeptNo());
 			if (i == 0) {
 				tEmployeeRetirement.setHandleFlag(0);
 				tEmployeeRetirement.setCreateBy("1");

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

@@ -157,9 +157,9 @@
 	</select>
 	<select id="selectByEmpIdcard" resultType="Integer">
 		SELECT count(*)
-		<include refid="Base_Column_List"/>
 		FROM t_employee_retirement a
 		where EMP_IDCARD=#{empIdCard}
+             and DEPT_NO=#{deptNo}
 	</select>
 	<select id="getBirthday" parameterType="String" resultMap="BaseResultMap">
 		SELECT a.EMP_NAME,