Merge remote-tracking branch 'origin/master'

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

@@ -38,7 +38,7 @@
 	</update>
 	
 	<update id="updateResult">
-		update sap_user set result=#{result} where personId=#{personId} and delFlag = 0
+		update sap_user set result=#{result} where personId=#{personId}
 	</update>
 	
 	<select id="selectByUserId" resultType="SapUser">
@@ -46,7 +46,7 @@
 	</select>
 	
 	<select id="selectListByPersonId" resultType="SapUser">
-		select * from sap_user where personId=#{personId} and delFlag = 0 order by isPrimary desc
+		select * from sap_user where personId=#{personId} order by isPrimary desc
 	</select>
 	
 	<select id="selectUnSyncList" resultType="SapUser">

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

@@ -123,7 +123,6 @@ public class SapUserService extends BaseService {
 		if (isTestWXSync) {
 			return WebConstants.SUCCESS;
 		}
-		System.out.println(personId);
 		List<SapUser> sapUsers = selectListByPersonId(personId);
 		SapUser wxSapUser = sapUsers.get(0);
 		Long[] firstOrgWxDepartIdList = new Long[sapUsers.size()];

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

@@ -23,11 +23,8 @@ public class TaskService extends BaseService {
 		try {
 			// 更新数据删除
 			sapUserService.updateAllDelete();
-			// 接口获取所有有效数据，保存或者更新delFlag=0
 			List<SapUser> getSapUsers = sapUserService.getSapUsers();
-
 			Map<String, Long> orgWxDepartMap = sapOrgService.updateAllWxDepartId();
-
 			LoggerUtil.info("接口获取所有有效数据->" + getSapUsers.size());
 			for (int i = 0; i < getSapUsers.size(); i ++) {
 				SapUser sapUser = getSapUsers.get(i);