Merge branch 'master' into developer

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

@@ -765,7 +765,12 @@ public class ClerkController extends WebBaseController {
         List<ClerkDTO> ret = new ArrayList<ClerkDTO>();
         StaffDTO staffDTO = staffApiService.selectById(staffId);
         if (staffDTO != null) {
-            List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIdList, staffDTO.getPhoneNumber());
+            String phoneNumber = staffDTO.getPhoneNumber();
+            if (StringUtils.isBlank(phoneNumber)) {
+                logger.error("手机号为空，staffId：{}",staffId);
+                return ret;
+            }
+            List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIdList, phoneNumber);
             if (CollectionUtils.isNotEmpty(clerkList)) {
                 ret.addAll(clerkList);
             }