liupeng преди 5 години
родител
ревизия
004f033ae5

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

@@ -47,6 +47,7 @@ public class SapUser implements Serializable {
 	private String result;
 	private String result;
 	private Boolean delFlag;
 	private Boolean delFlag;
 	private Date createDate;
 	private Date createDate;
+	private Integer sortNumber;
 
 
 	public String toCompareString() {
 	public String toCompareString() {
 		StringBuilder sBuilder = new StringBuilder();
 		StringBuilder sBuilder = new StringBuilder();

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

@@ -7,13 +7,13 @@
 			firstOrgName,secondOrgName,thirdOrgName,fourthOrgName,
 			firstOrgName,secondOrgName,thirdOrgName,fourthOrgName,
 			firstOrgWxDepartId,secondOrgWxDepartId,thirdOrgWxDepartId,fourthOrgWxDepartId,
 			firstOrgWxDepartId,secondOrgWxDepartId,thirdOrgWxDepartId,fourthOrgWxDepartId,
 			position,formatPosition,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
 			position,formatPosition,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
-			email,formatEmail,isPrimary,delFlag,createDate) 
+			email,formatEmail,isPrimary,delFlag,createDate,sortNumber) 
 		values (#{userId},#{personId},#{username},#{name},
 		values (#{userId},#{personId},#{username},#{name},
 			#{firstOrgId},#{secondOrgId},#{thirdOrgId},#{fourthOrgId},
 			#{firstOrgId},#{secondOrgId},#{thirdOrgId},#{fourthOrgId},
 			#{firstOrgName},#{secondOrgName},#{thirdOrgName},#{fourthOrgName},
 			#{firstOrgName},#{secondOrgName},#{thirdOrgName},#{fourthOrgName},
 			#{firstOrgWxDepartId},#{secondOrgWxDepartId},#{thirdOrgWxDepartId},#{fourthOrgWxDepartId},
 			#{firstOrgWxDepartId},#{secondOrgWxDepartId},#{thirdOrgWxDepartId},#{fourthOrgWxDepartId},
 			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
 			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
-			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate})
+			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate},#{sortNumber})
 	</insert>
 	</insert>
 	
 	
 	<update id="updateOne">
 	<update id="updateOne">
@@ -68,5 +68,6 @@
 	<select id="getUserListByName" resultType="SapUser">
 	<select id="getUserListByName" resultType="SapUser">
 		select * from sap_user 
 		select * from sap_user 
 		where result = 'SUCCESS' and name like CONCAT(CONCAT('%', #{name}),'%')
 		where result = 'SUCCESS' and name like CONCAT(CONCAT('%', #{name}),'%')
+		order by sortNumber ASC
 	</select>
 	</select>
 </mapper>
 </mapper>

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

@@ -29,11 +29,13 @@ public class TaskService extends BaseService {
 			Map<String, Long> orgWxDepartMap = sapOrgService.updateAllWxDepartId();
 			Map<String, Long> orgWxDepartMap = sapOrgService.updateAllWxDepartId();
 
 
 			LoggerUtil.info("接口获取所有有效数据->" + getSapUsers.size());
 			LoggerUtil.info("接口获取所有有效数据->" + getSapUsers.size());
-			for (SapUser sapUser : getSapUsers) {
+			for (int i = 0; i < getSapUsers.size(); i ++) {
+				SapUser sapUser = getSapUsers.get(i);
 				sapUser.setFirstOrgWxDepartId(orgWxDepartMap.get(sapUser.getFirstOrgId()));
 				sapUser.setFirstOrgWxDepartId(orgWxDepartMap.get(sapUser.getFirstOrgId()));
 				sapUser.setSecondOrgWxDepartId(orgWxDepartMap.get(sapUser.getSecondOrgId()));
 				sapUser.setSecondOrgWxDepartId(orgWxDepartMap.get(sapUser.getSecondOrgId()));
 				sapUser.setThirdOrgWxDepartId(orgWxDepartMap.get(sapUser.getThirdOrgId()));
 				sapUser.setThirdOrgWxDepartId(orgWxDepartMap.get(sapUser.getThirdOrgId()));
 				sapUser.setFourthOrgWxDepartId(orgWxDepartMap.get(sapUser.getFourthOrgId()));
 				sapUser.setFourthOrgWxDepartId(orgWxDepartMap.get(sapUser.getFourthOrgId()));
+				sapUser.setSortNumber(i + 1);
 				SapUser sapUserDb = sapUserService.selectOne(sapUser.getUserId());
 				SapUser sapUserDb = sapUserService.selectOne(sapUser.getUserId());
 				if (sapUserDb == null) {
 				if (sapUserDb == null) {
 					sapUserService.saveOneAndSyncWX(sapUser);
 					sapUserService.saveOneAndSyncWX(sapUser);