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

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

@@ -250,7 +250,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                     }
                 }
 				staffDepartmentRelatedService.del(related);
-				staffService.delByuserid(relatedList.get(0).getStaffId());
+//				staffService.delByuserid(relatedList.get(0).getStaffId());
 				
 				TabHaobanStaffDepartmentRelated staffRelated = relatedList.get(0);
 				if(StringUtils.isNotBlank(staffRelated.getClerkCode())){

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

@@ -258,24 +258,24 @@ public class ClerkController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("/staff-add")
 	public HaobanResponse staffAdd(StaffDTO staffDTO,String storeId,String clerkCode) {
-		String wxEnterpriseId = staffDTO.getWxEnterpriseId();
-		String staffName = staffDTO.getStaffName();
-		String phoneNumber = staffDTO.getPhoneNumber();
-		String nationcode = staffDTO.getNationCode();
-		String postion = staffDTO.getPostion();
-		Integer sex = staffDTO.getSex();
-		staffDTO.setWxEnterpriseId(wxEnterpriseId);
-		if(StringUtils.isBlank(staffName)) {
-			return resultResponse(HaoBanErrCode.ERR_10004);
-		}
-		StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);
-		if(staff != null) {
-			return resultResponse(HaoBanErrCode.ERR_10005);
-		}
-		boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
-		if(!flag){
-			return resultResponse(HaoBanErrCode.ERR_10010);
-		}
+//		String wxEnterpriseId = staffDTO.getWxEnterpriseId();
+//		String staffName = staffDTO.getStaffName();
+//		String phoneNumber = staffDTO.getPhoneNumber();
+//		String nationcode = staffDTO.getNationCode();
+//		String postion = staffDTO.getPostion();
+//		Integer sex = staffDTO.getSex();
+//		staffDTO.setWxEnterpriseId(wxEnterpriseId);
+//		if(StringUtils.isBlank(staffName)) {
+//			return resultResponse(HaoBanErrCode.ERR_10004);
+//		}
+//		StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);
+//		if(staff != null) {
+//			return resultResponse(HaoBanErrCode.ERR_10005);
+//		}
+//		boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
+//		if(!flag){
+//			return resultResponse(HaoBanErrCode.ERR_10010);
+//		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}