fix

code/sapparent/sapservice/src/main/java/org/fouram/entity/SapUser.java

@@ -11,6 +11,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ *	垃圾数据更新为删除2
+ *	离职数据更新为删除1，无效
+ *	其他result类型数据0
+ */
 @Data
 @Builder
 @NoArgsConstructor

code/sapparent/sapservice/src/main/java/org/fouram/enums/SapUserResultEnum.java

@@ -6,6 +6,7 @@ public enum SapUserResultEnum {
 	SUCCESS("SUCCESS", "执行成功"), 
 	SENSITIVE("SENSITIVE", "敏感数据"), 
 	ENTRY("ENTRY", "入职"),
+	LEAVE("LEAVE", "离职"),
 	BLACKLIST("BLACKLIST", "黑名单"),
 	GARBAGE("GARBAGE", "垃圾数据"),
 	INGORE("INGORE", "忽略不操作");

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -41,6 +41,10 @@
 		update sap_user set result=#{result} where personId=#{personId}
 	</update>
 	
+	<update id="updateResultByDelFlag">
+		update sap_user set result=#{result} where delFlag=#{delFlag}
+	</update>
+	
 	<select id="selectByUserId" resultType="SapUser">
 		select * from sap_user where userId=#{userId}
 	</select>
@@ -64,7 +68,8 @@
 	
 	<select id="selectPrimaryListByName" resultType="SapUser">
 		select * from sap_user 
-		where result = 'SUCCESS' and isPrimary = 1 and delFlag = 0 and name like CONCAT(CONCAT('%', #{name}),'%')
+		where result = 'SUCCESS' and isPrimary = 1 and delFlag = 0 
+			and name like CONCAT(CONCAT('%', #{name}),'%')
 		order by sortNumber ASC
 	</select>
 	
@@ -100,7 +105,13 @@
 	
 	<select id="selectToBeConfirmedPrimaryList" resultType="SapUser">
 		select * from sap_user 
-		where isPrimary = 1 and delFlag = 0 
+		where isPrimary = 1 and delFlag = 0 and result in ('ENTRY','LEAVE','SENSITIVE')
+		<if test="type != null and type != ''">
+			and result = #{type} 
+		</if>
+		<if test="name != null and name != ''">
+			and name like CONCAT(CONCAT('%', #{name}),'%')
+		</if>
 		order by sortNumber ASC
 	</select>
 </mapper>

code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -101,6 +101,8 @@ public class SapUserService extends BaseService {
 				}
 			}
 		}
+		// 更新所有无效数据为LEAVE
+		this.updateResultByDelFlag(SapUserResultEnum.LEAVE, DelFlagEnum.UNABLE);
 	}
 
 	/**
@@ -238,6 +240,11 @@ public class SapUserService extends BaseService {
 		update("SapUserMapper.updateAllDelFlag", delFlag);
 	}
 
+	public void updateResultByDelFlag(SapUserResultEnum sapUserResultEnum, DelFlagEnum delFlagEnum) throws Exception {
+		SapUser entity = SapUser.builder().result(sapUserResultEnum.getCode()).delFlag(delFlagEnum.getCode()).build();
+		update("SapUserMapper.updateResultByDelFlag", entity);
+	}
+
 	public void updateDelFlag(String userId, DelFlagEnum delFlagEnum) throws Exception {
 		SapUser entity = SapUser.builder().userId(userId).delFlag(delFlagEnum.getCode()).build();
 		update("SapUserMapper.updateDelFlag", entity);