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

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

@@ -1016,11 +1016,15 @@ public class WxStaffController extends WebBaseController {
                 String staffId = bindCodeMap.get(dto.getClerkCode()).getStaffId();
                 StaffDTO staffDTO = staffApiService.selectById(staffId);
                 vo.setStaffId(staffId);
-                if (StringUtils.isNotBlank(dto.getNationcode())) {
-                    vo.setNationCode(dto.getNationcode());
-                }
-                if (StringUtils.isNotBlank(dto.getPhoneNumber())) {
-                    vo.setPhoneNumber(dto.getPhoneNumber());
+                String phoneNumber = dto.getPhoneNumber();
+                if (StringUtils.isNotBlank(phoneNumber)) {
+                    vo.setPhoneNumber(phoneNumber);
+                    if (StringUtils.isNotBlank(dto.getNationcode())) {
+                        vo.setNationCode(dto.getNationcode());
+                    }
+                }else {
+                    vo.setPhoneNumber("");
+                    vo.setNationCode("");
                 }
                 vo.setStaffName(staffDTO == null ? "" : staffDTO.getStaffName());
                 bindList.add(vo);