Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -323,7 +323,9 @@ public class StaffApiServiceImpl implements StaffApiService {
         if (staffThirdWxEnterpriseId.contains(corpid)) {
             user = qywxUserApiService.getWorkWxUser(corpid, config.getWxSuiteid(), userId);
             UserDTO userSelf = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), user.getOpen_userid());
-            user.setName(userSelf.getName());
+            if (user != null && userSelf != null) {
+                user.setName(userSelf.getName());
+            }
         } else {
             user = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), userId);
         }