fix

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

@@ -27,19 +27,7 @@ public class SapUser implements Serializable {
 	// 姓名
 	private String name;
 	
-	// 原先数据
-	private String firstOrgIdOriginal;
-	private String secondOrgIdOriginal;
-	private String thirdOrgIdOriginal;
-	private String fourthOrgIdOriginal;
-	private String firstOrgNameOriginal;
-	private String secondOrgNameOriginal;
-	private String thirdOrgNameOriginal;
-	private String fourthOrgNameOriginal;
-	private String positionOriginal;
-	private String formatPositionOriginal;
-	
-	// 当前数据
+	// sap机构
 	private String firstOrgId;
 	private String secondOrgId;
 	private String thirdOrgId;
@@ -48,13 +36,15 @@ public class SapUser implements Serializable {
 	private String secondOrgName;
 	private String thirdOrgName;
 	private String fourthOrgName;
+	
+	// 微信机构
 	private Long firstOrgWxDepartId;
 	private Long secondOrgWxDepartId;
 	private Long thirdOrgWxDepartId;
 	private Long fourthOrgWxDepartId;
+	
 	private String position;
 	private String formatPosition;
-	
 	// 手机
 	private String mobile;
 	private String formatMobile;

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

@@ -99,11 +99,7 @@
 		order by sortNumber ASC
 	</select>
 	
-	<delete id="updateUnableByUserId">
-		update sap_user set delFlag = 1 where userId=#{userId} 
-	</delete>
-	
-	<delete id="deleteByUserId">
-		update sap_user set delFlag = 2 where userId=#{userId} 
+	<delete id="updatDelFlagByUserId">
+		update sap_user set delFlag = #{delFlag} where userId=#{userId} 
 	</delete>
 </mapper>

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

@@ -250,12 +250,11 @@ public class SapUserService extends BaseService {
 		update("SapUserMapper.updateAvatar", sapUser);
 	}
 
-	public void deleteByUserId(String userId) throws Exception {
-		update("SapUserMapper.deleteByUserId", userId);
-	}
-	
-	public void updateUnableByUserId(String userId) throws Exception {
-		update("SapUserMapper.updateUnableByUserId", userId);
+	public void updatDelFlagByUserId(String userId, Integer delFlag) throws Exception {
+		PageData pd = new PageData();
+		pd.put("userId", userId);
+		pd.put("delFlag", delFlag);
+		update("SapUserMapper.updatDelFlagByUserId", pd);
 	}
 
 	public void deleteQuitUserByUserId(String userId, String oprUserId) throws Exception {
@@ -263,7 +262,7 @@ public class SapUserService extends BaseService {
 		String personId = sapUser.getPersonId();
 		List<SapUser> sapUsers = selectListByPersonId(personId);
 		for(SapUser user : sapUsers) {
-			deleteByUserId(user.getUserId());
+			updatDelFlagByUserId(user.getUserId(), DelFlagEnum.DELETED);
 		}
 		WXCpUserUtil.delete(personId);
 		sapOprLogService.saveOne(JSONUtil.toString(sapUsers), WebConstants.OPRTYPE_DELETE, oprUserId);
@@ -275,7 +274,7 @@ public class SapUserService extends BaseService {
 			WxCpUser wxUser = WXCpUserUtil.getByIdOrEmail(user.getUserId(), null);
 			if(wxUser == null) {
 				System.out.println(user.getUserId());
-				updateUnableByUserId(user.getUserId());
+				updatDelFlagByUserId(user.getUserId(), DelFlagEnum.UNABLE);
 			}
 		}
 	}