fix

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

@@ -243,6 +243,7 @@ public class ClerkController extends WebBaseController{
 	}
 	
 	//新增店员
+	@HttpLimit
 	@RequestMapping("/satff-add")
 	public HaobanResponse staffAdd(StaffDTO staffDTO,String storeId,String clerkCode) {
 		String wxEnterpriseId = staffDTO.getWxEnterpriseId();
@@ -264,29 +265,41 @@ public class ClerkController extends WebBaseController{
 	}
 	
 	//删除店员
+	@HttpLimit
 	@RequestMapping("/staff-del")
-	public HaobanResponse staffDel(String staffDepartmentRelatedId,String storeId) {
+	public HaobanResponse staffDel(String staffDepartmentRelatedIds,String storeId) {
 		DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(storeId);
 		if(departmentDTO == null){
-			return resultResponse(HaoBanErrCode.ERR_10006);
+			return resultResponse(HaoBanErrCode.ERR_10009);
 		}
-		StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
-		if(related == null){
-			return resultResponse(HaoBanErrCode.ERR_10006);
+		if(StringUtils.isBlank(staffDepartmentRelatedIds)){
+			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		if(StringUtils.isBlank(related.getClerkCode())){
-			staffApiService.del(staffDepartmentRelatedId);
-		}else{
-			ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
-			if(clerk != null && distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId) == 0){
-				syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
+		String[] staffDepartmentRelatedIdArr = staffDepartmentRelatedIds.split(",");
+		boolean flag = false;
+		for (String staffDepartmentRelatedId : staffDepartmentRelatedIdArr) {
+			StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
+			if(related == null){
+				flag = true;
+			}
+			if(StringUtils.isBlank(related.getClerkCode())){
+				staffApiService.del(staffDepartmentRelatedId);
+			}else{
+				ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
+				if(clerk != null && distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId) == 0){
+					syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
+				}
 			}
 		}
+		if(flag){
+			return resultResponse(HaoBanErrCode.ERR_999);
+		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 	
 	
 	//设置主导购
+	@HttpLimit
 	@RequestMapping("/set-main-store")
 	public HaobanResponse setMainStore(String staffId,String storeId,String wxEnterpriseId,String staffDepartmentRelatedId) {
 		StaffDTO staff = staffApiService.selectById(staffId);

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

@@ -190,8 +190,10 @@ public enum HaoBanErrCode {
     ERR_10005(10005,"成员已存在"),
     ERR_10006(10006,"成员不存在"),
     ERR_10007(10007,"本月已经设置过主导购"),
-
     
+    ERR_10009(10009,"门店不存在"),
+
+    ERR_999(999, "部门操作失败"),
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");
     private int code;