Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -385,29 +385,25 @@ public class StaffApiServiceImpl implements StaffApiService {
 		}
 		arr[0] = "86";
 		arr[1] = phoneNumber;
-		if(phoneNumber.startsWith("853")){
+		if(phoneNumber.startsWith("+853")){
 			arr[0] = "853";
-			arr[1] = phoneNumber.replace("853", "");
+			arr[1] = phoneNumber.replace("+853", "");
 		}
-		if(phoneNumber.startsWith("852")){
+		if(phoneNumber.startsWith("+852")){
 			arr[0] = "852";
-			arr[1] = phoneNumber.replace("852", "");
+			arr[1] = phoneNumber.replace("+852", "");
 		}
-		if(phoneNumber.startsWith("886")){
+		if(phoneNumber.startsWith("+886")){
 			arr[0] = "886";
-			arr[1] = phoneNumber.replace("886", "");
+			arr[1] = phoneNumber.replace("+886", "");
 		}
-		if(phoneNumber.startsWith("65")){
+		if(phoneNumber.startsWith("+65")){
 			arr[0] = "65";
-			arr[1] = phoneNumber.replace("65", "");
+			arr[1] = phoneNumber.replace("+65", "");
 		}
-		if(phoneNumber.startsWith("66")){
+		if(phoneNumber.startsWith("+66")){
 			arr[0] = "66";
-			arr[1] = phoneNumber.replace("66", "");
-		}
-		if(phoneNumber.startsWith("853")){
-			arr[0] = "853";
-			arr[1] = phoneNumber.replace("853", "");
+			arr[1] = phoneNumber.replace("+66", "");
 		}
 		return arr;
 	}
@@ -440,14 +436,14 @@ public class StaffApiServiceImpl implements StaffApiService {
 		departmentDTOList.forEach(departmentDTO -> {
 			if (!finalHasRelationMap.containsKey(departmentDTO.getDepartmentId())) {
 				StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
-				dto.setPhoneNumber(user.getMobile());
+				dto.setPhoneNumber(staff.getPhoneNumber());
 				dto.setWxUserId(user.getUserid());
 				dto.setStaffId(finalStaff.getStaffId());
 				dto.setStaffName(user.getName());
 				dto.setWxEnterpriseId(wxEnterpriseId);
 				dto.setStatusFlag(1);
 				dto.setDepartmentId(departmentDTO.getDepartmentId());
-				dto.setNationCode("86");
+				dto.setNationCode(staff.getNationCode());
 				dto.setStaffName(user.getName());
 				staffDepartmentRelatedService.add(dto);
 			}