Przeglądaj źródła

还原formatPosition处理数据

liupeng 5 lat temu
rodzic
commit
219e8759c0

+ 1 - 0
code/sapparent/sapservice/src/main/java/org/fouram/entity/SapUser.java

@@ -39,6 +39,7 @@ public class SapUser implements Serializable {
 	private Long thirdOrgWxDepartId;
 	private Long fourthOrgWxDepartId;
 	private String position;
+	private String formatPosition;
 	private String mobile;
 	//手机
 	private String formatMobile;

+ 4 - 3
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -6,13 +6,13 @@
 			firstOrgId,secondOrgId,thirdOrgId,fourthOrgId,
 			firstOrgName,secondOrgName,thirdOrgName,fourthOrgName,
 			firstOrgWxDepartId,secondOrgWxDepartId,thirdOrgWxDepartId,fourthOrgWxDepartId,
-			position,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
+			position,formatPosition,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
 			email,formatEmail,isPrimary,delFlag,createDate,sortNumber) 
 		values (#{userId},#{personId},#{username},#{name},
 			#{firstOrgId},#{secondOrgId},#{thirdOrgId},#{fourthOrgId},
 			#{firstOrgName},#{secondOrgName},#{thirdOrgName},#{fourthOrgName},
 			#{firstOrgWxDepartId},#{secondOrgWxDepartId},#{thirdOrgWxDepartId},#{fourthOrgWxDepartId},
-			#{position},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
+			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
 			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate},#{sortNumber})
 	</insert>
 	
@@ -25,7 +25,8 @@
 			thirdOrgName=#{thirdOrgName},fourthOrgName=#{fourthOrgName},
 			firstOrgWxDepartId=#{firstOrgWxDepartId},secondOrgWxDepartId=#{secondOrgWxDepartId},
 			thirdOrgWxDepartId=#{thirdOrgWxDepartId},fourthOrgWxDepartId=#{fourthOrgWxDepartId},
-			position=#{position},mobile=#{mobile},formatMobile=#{formatMobile},
+			position=#{position},formatPosition=#{formatPosition},
+			mobile=#{mobile},formatMobile=#{formatMobile},
 			businessPhone=#{businessPhone},formatBusinessPhone=#{formatBusinessPhone},
 			gender=#{gender},email=#{email},formatEmail=#{formatEmail},
 			isPrimary=#{isPrimary},delFlag=#{delFlag}

+ 1 - 0
code/sapparent/sapservice/src/main/java/org/fouram/service/SapEmpJobService.java

@@ -36,6 +36,7 @@ public class SapEmpJobService extends BaseService {
 		}
 		for(SapUser sapUser : sapUsers) {
 			sapUser.setPosition(jobTitleMap.get(sapUser.getUserId()));
+			sapUser.setFormatPosition(sapUser.getPosition());
 		}
 	}
 }

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

@@ -128,7 +128,7 @@ public class SapUserService extends BaseService {
 			fourthOrgWxDepartIdList[i] = sapUser.getFourthOrgWxDepartId();
 		}
 		return WXCpUserUtil.createOrUpdate(personId, wxSapUser.getName(), firstOrgWxDepartIdList,
-				secondOrgWxDepartIdList, thirdOrgWxDepartIdList, fourthOrgWxDepartIdList, wxSapUser.getPosition(),
+				secondOrgWxDepartIdList, thirdOrgWxDepartIdList, fourthOrgWxDepartIdList, wxSapUser.getFormatPosition(),
 				wxSapUser.getFormatMobile(), wxSapUser.getGender(), wxSapUser.getFormatEmail(),
 				wxSapUser.getFormatBusinessPhone(), wxSapUser.getFirstOrgName());
 	}