Merge remote-tracking branch 'origin/developer' into developer

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

 package com.gic.haoban.manage.service.service.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -106,6 +107,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 	}
 	@Override
 	public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
+		if(clerkList == null || clerkList.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
 		return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class,mapper.listByClerkIds(clerkList));
 	}
 }

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

@@ -167,6 +167,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	}
 	@Override
 	public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds) {
+		if(clerkIds == null || clerkIds.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
 		List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds);
 		if(CollectionUtil.isEmpty(list)){
 			return new ArrayList<StaffClerkRelationDTO>();

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

@@ -762,6 +762,12 @@ public class ClerkController extends WebBaseController{
 			clerk.setImageUrl(headPic);
 		}
 		if(StringUtils.isNotBlank(phoneNumber)){
+			List<ClerkListDTO> list = clerkService.getClerkByStoreId(clerk.getEnterpriseId(), clerk.getStoreId());
+			for (ClerkListDTO clerkListDTO : list) {
+				if(clerkListDTO.getPhoneNumber().equals(phoneNumber) && !clerkListDTO.getClerkId().equals(clerkId)){
+					return resultResponse(HaoBanErrCode.ERR_11122);
+				}
+			}
 			clerk.setPhoneNumber(phoneNumber);
 		}
 		if(StringUtils.isNotBlank(nationCode)){

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -213,6 +213,8 @@ public enum HaoBanErrCode {
     ERR_10020(10020,"该用户已在该门店绑定过code"),
 
     ERR_10021(10021,"待审核中存在code或该手机号"),
+    
+    ERR_11122(11122,"手机号已存在"),
 
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),