Merge branch 'devloper20200401' into 'master'

Devloper20200401

See merge request !15

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -249,6 +249,7 @@
     and phone_number = #{phoneNumber}
     and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag = 1
+    limit 1
   </select>
   
   <select id="listByPhoneNumber" resultMap="BaseResultMap" >

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

@@ -691,6 +691,9 @@ public class DepartmentContoller extends WebBaseController{
 			for (ClerkListDTO clerkListDTO : list) {
 				String nationcode = clerkListDTO.getNationcode();
 				String phoneNumber = clerkListDTO.getPhoneNumber();
+				if(StringUtils.isBlank(phoneNumber)){
+					continue;
+				}
 				String clerkCode = clerkListDTO.getClerkCode();
 				StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
 				if(staff == null){