Merge branch 'master' of ssh://10.10.100.21/source/uas-office-integration

uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/service/UasEmployeeService.java

@@ -163,6 +163,7 @@ public class UasEmployeeService extends AbstractService {
             return;
         }
         boolean changed = false;
+        boolean mobileChanged = false;
         UpdateUserReq req = new UpdateUserReq();
         if (!StringUtils.equals(employee.getEm_name(), user.getName())) {
             changed = true;
@@ -170,8 +171,15 @@ public class UasEmployeeService extends AbstractService {
         }
         if (!StringUtils.equals(employee.getEm_mobile(), user.getMobile())) {
             if (!StringUtils.isEmpty(employee.getEm_mobile())) {
-                changed = true;
-                req.mobile(employee.getEm_mobile());
+                if (StringUtils.isEmpty(user.getMobile())) {
+                    changed = true;
+                    req.mobile(employee.getEm_mobile());
+                } else if (!StringUtils.equals(employee.getEm_mobile().replace("+", "00"),
+                        user.getMobile().replace("+", "00"))) {
+                    changed = true;
+                    mobileChanged = true;
+                    req.mobile(employee.getEm_mobile());
+                }
             }
         }
         if (!StringUtils.equals(employee.getEm_email(), user.getEmail())) {
@@ -213,11 +221,17 @@ public class UasEmployeeService extends AbstractService {
             }
         }
         req.department(departmentList);
+        if(mobileChanged){
+            logger.debug("update qywx user mobile " + JSON.toJSONString(req.userId(user.getUserid()).build()));
+            addrBookSdk.deleteUser(user.getUserid());
+            createUser(employee, orgList);
 
-        if (changed || 0 == user.getEnable()) {
+        }else if (changed || 0 == user.getEnable()) {
             logger.debug("update qywx user " + JSON.toJSONString(req.userId(user.getUserid()).enable(true).build()));
             addrBookSdk.updateUser(req.userId(user.getUserid()).enable(true));
         }
+
+
     }
 
     private void createUser(Employee employee, List<HrOrg> orgList) {