fix

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

@@ -40,8 +40,6 @@ public class SapUser implements Serializable {
 	
 	private String cardId;
 	
-	private Integer cardType;
-	
 	private String jobNumber;
 
 	// sap机构

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

@@ -6,12 +6,14 @@
 			firstOrgId,secondOrgId,thirdOrgId,fourthOrgId,
 			firstOrgName,secondOrgName,thirdOrgName,fourthOrgName,
 			position,formatPosition,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
-			email,formatEmail,isPrimary,delFlag,createDate,result,sortNumber,startDate,endDate) 
+			email,formatEmail,isPrimary,delFlag,createDate,result,sortNumber,startDate,endDate,
+			cardId,jobNumber) 
 		values (#{userId},#{personId},#{username},#{name},
 			#{firstOrgId},#{secondOrgId},#{thirdOrgId},#{fourthOrgId},
 			#{firstOrgName},#{secondOrgName},#{thirdOrgName},#{fourthOrgName},
 			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
-			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate},#{result},#{sortNumber},#{startDate},#{endDate})
+			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate},#{result},#{sortNumber},#{startDate},#{endDate},
+			#{cardId},#{jobNumber})
 	</insert>
 	
 	<update id="updateOne">
@@ -26,7 +28,7 @@
 			businessPhone=#{businessPhone},formatBusinessPhone=#{formatBusinessPhone},
 			gender=#{gender},email=#{email},formatEmail=#{formatEmail},
 			isPrimary=#{isPrimary},result=#{result},delFlag=#{delFlag},
-			startDate=#{startDate},endDate=#{endDate}
+			startDate=#{startDate},endDate=#{endDate},cardId=#{cardId},jobNumber=#{jobNumber}
 		where userId=#{userId}
 	</update>
 	

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

@@ -32,7 +32,11 @@ public class SapEmpEmploymentService extends BaseService {
 				JsonNode node = iterator.next();
 				String userId = JsonNodeUtil.getValue(node, "userId");
 				startDateMap.put(userId, JsonNodeUtil.getValue(node, "startDate"));
-				jobNumberMap.put(userId, JsonNodeUtil.getValue(node, "jobNumber"));
+				if(node.has("jobNumber")) {
+					jobNumberMap.put(userId, JsonNodeUtil.getValue(node, "jobNumber"));
+				} else {
+					jobNumberMap.put(userId, "");
+				}
 			}
 		}
 		for (SapUser sapUser : sapUsers) {

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

@@ -525,7 +525,7 @@ public class SapUserService extends BaseService {
 	public void uploadHrEmpUserInfo(SapUser user, Integer type) throws Exception {
 		UploadModifyEmpDTO reqdata = UploadModifyEmpDTO.builder().username(user.getUsername())
 				.entryDate(user.getStartDate()).resignDate(user.getEndDate()).type(type).phone(user.getFormatMobile())
-				.cardId(user.getCardId()).cardType(user.getCardType()).jobNumber(user.getJobNumber()).build();
+				.cardId(user.getCardId()).cardType(1).jobNumber(user.getJobNumber()).build();
 		String url = "http://cmcadmin.info666.com/hr/emp/modifyEmpInfo";
 		JSONObject parameters = new JSONObject();
 		parameters.put("reqdata", reqdata);