Merge branch 'master_xgh_待开发调整711' into 'master'

Master xgh 待开发调整711

See merge request !194

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

@@ -321,11 +321,15 @@ public class StaffApiServiceImpl implements StaffApiService {
             res.setCode(3);
             return res;
         }
+        String nationCode = null ;
+        String phoneNumber = null;
         String imageUrl = changeHeaderImageUrl(user.getAvatar());
         String mobile = user.getMobile();
-        String[] arr = getNationCodeAndPhoneNumber(mobile);
-        String nationCode = arr[0];
-        String phoneNumber = arr[1];
+        if(StringUtils.isNotBlank(mobile)) {
+            String[] arr = getNationCodeAndPhoneNumber(mobile);
+            nationCode = arr[0];
+            phoneNumber = arr[1];
+        }
         TabHaobanStaff staff = staffService.selectByPhoneNumberOrUserIdAndEnterpriseId(phoneNumber, userId, wxEnterpriseId);
         if (staff != null) {
             staffService.delOtherStaffByWxUserId(staff.getWxUserId(), staff.getStaffId(), wxEnterpriseId);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -368,6 +368,7 @@ public class StaffController extends WebBaseController {
             logger.info("没有权限门店");
             return resultResponse(HaoBanErrCode.ERR_1);
         }
+        logger.info("好办门店数={},wxEnterpriseId={},enterpriseIds={}",storeIds.size(),wxEnterpriseId,enterpriseIds);
         List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIds, storeIds, search);
         List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList);
         if (CollectionUtils.isNotEmpty(retList)) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -160,6 +160,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
                     } else {
                         loginStaff = staffDTOS.get(0);
                     }
+                }else {
+                    logger.info("伪登录关联用户查不到,user={}",dictValue);
                 }
             }
         }