Merge remote-tracking branch 'origin/master'

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpDepartUtil.java

@@ -110,11 +110,15 @@ public class WXCpDepartUtil {
 			}
 			return depatmentId;
 		} else {
-			WxCpDepart depart = new WxCpDepart();
-			depart.setId(id);
-			depart.setName(name);
-			depart.setParentId(parentId);
-			departService.update(depart);
+			Map<String, Long> map = getChildDepartMap(parentId);
+			Long depatmentId = map.get(name);
+			if(!id.equals(depatmentId)) {
+				WxCpDepart depart = new WxCpDepart();
+				depart.setId(id);
+				depart.setName(name);
+				depart.setParentId(parentId);
+				departService.update(depart);
+			}
 			return id;
 		}
 	}

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

@@ -34,7 +34,7 @@ public class SapUserService extends BaseService {
 	@Autowired
 	private SapPersonalService sapPersonalService;
 
-	private static boolean isTestWXSync = false;
+	private static boolean isTestWXSync = true;
 	private static boolean isTestMobile = false;
 
 	public List<SapUser> getSapUsers() throws Exception {
@@ -111,7 +111,7 @@ public class SapUserService extends BaseService {
 	private String createOrUpdateWXUser(String personId) throws Exception {
 		// 测试
 		if (isTestWXSync) {
-			return WebConstants.SUCCESS;
+			return "TEST-" + WebConstants.SUCCESS;
 		}
 		List<SapUser> sapUsers = selectListByPersonId(personId);
 		SapUser wxSapUser = sapUsers.get(0);

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

@@ -71,11 +71,11 @@ public class TaskService extends BaseService {
 		List<SapUser> unableSapUsers = sapUserService.selectDeleteList();
 		LoggerUtil.info("SAP禁用数据->" + unableSapUsers.size());
 		// 防止极端情况导致大批量被禁用
-		if(unableSapUsers.size() < 20) {
-			for(SapUser sapUser : unableSapUsers) {
-				WXCpUserUtil.updateUnable(sapUser.getPersonId());
-			}
-		}
+//		if(unableSapUsers.size() < 20) {
+//			for(SapUser sapUser : unableSapUsers) {
+//				WXCpUserUtil.updateUnable(sapUser.getPersonId());
+//			}
+//		}
 
 		// 部分数据插入微信未成功，处理数据后，重新插入
 		List<SapUser> unSyncSapUsers = sapUserService.selectUnSyncList();

code/sapparent/sapservice/src/main/resources/env/develop/jdbc.properties

@@ -2,3 +2,8 @@ jdbc_url=jdbc:mysql://118.25.182.250:3306/cmc_sap?useUnicode=true&characterEncod
 jdbc_driverClassName=com.mysql.jdbc.Driver
 jdbc_username=cmc
 jdbc_password=123456
+
+#jdbc_url=jdbc:mysql://localhost:3306/sap?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false
+#jdbc_driverClassName=com.mysql.jdbc.Driver
+#jdbc_username=root
+#jdbc_password=123456