Merge branch 'developer' into 'master'

Developer

See merge request !346

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

@@ -332,7 +332,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 continue;
             }
             int type = 0 ;
-            if(wxEnterpriseId.endsWith("#")) {
+            if(wxEnterpriseId.endsWith("_")) {
                 wxEnterpriseId = wxEnterpriseId.substring(0,wxEnterpriseId.length()-1) ;
                 type = 1 ;
             }

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

@@ -160,7 +160,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
         if (null != secretSetting && StringUtils.isNotBlank(secretSetting.getSecretVal())) {
             UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
             logger.info("成员详情(代开)={}",JSON.toJSONString(user)) ;
-            if(null != user.getDepartment()) {
+            if(null != user && null != user.getDepartment()) {
                 this.staffDepartChange(staff, wxEnterpriseId, user.getDepartment(),false); ;
             }
         }