Merge branch 'developer_repair_contact20200408' into 'developer'

Developer repair contact20200408

See merge request !37

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

@@ -604,6 +604,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 			}
 
 			if ("nationcode".equals(name)) {
+				if(StringUtils.isNotBlank(value) && value.startsWith("+")){
+					value = value.replace("+", "");
+				}
 				clerkMid.setNationcode((StringUtils.isBlank(value) ? "86" : value));
 				continue;
 			}

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

@@ -213,6 +213,7 @@
     from tab_haoban_staff_department_related
     where staff_id = #{staffId,jdbcType=VARCHAR}
     and status_flag = 1
+    group by department_id
   </select>
   <update id="delByUserid" >
     update tab_haoban_staff_department_related

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) {
 				try {
 					String nationcode = clerkListDTO.getNationcode();
+					if(StringUtils.isNotBlank(nationcode) && nationcode.startsWith("+")){
+						nationcode = nationcode.replace("+", "");
+					}
 					String phoneNumber = clerkListDTO.getPhoneNumber();
 					if(StringUtils.isBlank(phoneNumber)){
 						continue;