fix

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

@@ -1,14 +1,18 @@
 package org.fouram.enums;
 
+import org.apache.commons.lang3.StringUtils;
+
 public enum CardTypeEnum {
 
-	ID_CARD("ResidentIdCard", "身份证号"), HK_ID_CARD("HKID1", "香港身份证号");
+	ID("ResidentIdCard", 1, "中国"), HKID("HKID1", 3, "中国香港"), IDC("IDC", 4, "中国台湾");
 
 	private final String code;
+	private final Integer mycode;
 	private final String desc;
 
-	CardTypeEnum(String code, String desc) {
+	CardTypeEnum(String code, Integer mycode, String desc) {
 		this.code = code;
+		this.mycode = mycode;
 		this.desc = desc;
 	}
 
@@ -19,4 +23,20 @@ public enum CardTypeEnum {
 	public String getDesc() {
 		return desc;
 	}
+
+	public Integer getMycode() {
+		return mycode;
+	}
+
+	public static CardTypeEnum getEnum(String code) {
+		if (StringUtils.isBlank(code)) {
+			return null;
+		}
+		for (CardTypeEnum instance : values()) {
+			if (instance.getCode() == code || instance.getCode().equals(code)) {
+				return instance;
+			}
+		}
+		return null;
+	}
 }

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

@@ -28,6 +28,7 @@ import org.fouram.entity.SapMessageUser;
 import org.fouram.entity.SapOrg;
 import org.fouram.entity.SapUser;
 import org.fouram.entity.WxUser;
+import org.fouram.enums.CardTypeEnum;
 import org.fouram.enums.DelFlagEnum;
 import org.fouram.enums.SapUserResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -304,7 +305,7 @@ public class SapUserService extends BaseService {
 	public List<SapUser> selectListByPersonId(String personId) throws Exception {
 		return (List<SapUser>) findList("SapUserMapper.selectListByPersonId", personId);
 	}
-	
+
 	public void updateAllDelFlag(Integer delFlag) throws Exception {
 		update("SapUserMapper.updateAllDelFlag", delFlag);
 	}
@@ -521,7 +522,7 @@ public class SapUserService extends BaseService {
 		SapUser sapUser = SapUser.builder().userId(userId).sendEntryMessageFlag(sendEntryMessageFlag).build();
 		update("SapUserMapper.updateSendLeaveMessageFlag", sapUser);
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public List<SapUser> select2021LeaveAndEntryList() throws Exception {
 		return (List<SapUser>) findList("SapUserMapper.select2021LeaveAndEntryList", null);
@@ -530,7 +531,8 @@ 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(1).jobNumber(user.getJobNumber()).build();
+				.cardId(user.getCardId()).cardType(CardTypeEnum.getEnum(user.getCardType()).getMycode())
+				.jobNumber(user.getJobNumber()).build();
 		String url = "http://cmcadmin.info666.com/hr/emp/modifyEmpInfo";
 		JSONObject parameters = new JSONObject();
 		parameters.put("reqdata", reqdata);