111

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

@@ -340,9 +340,7 @@ public class ClerkController extends WebBaseController{
 				audit.setOldValue(json.toJSONString());
 				audit.setCommitTime(new Date());
 				audit.setAuditType(3);
-				
 				auditApiService.insert(audit);
-				
 				return resultResponse(HaoBanErrCode.ERR_1);
 			}
 		}
@@ -356,12 +354,11 @@ public class ClerkController extends WebBaseController{
 	//删除店员
 	@HttpLimit
 	@RequestMapping("/staff-del")
-	public HaobanResponse staffDel(String staffDepartmentRelatedIds,String storeId,Integer version,String clerkIds,String staffId) {
-		
-		boolean needAudit = true;
-		//是否需要审核
+	public HaobanResponse staffDel(String staffDepartmentRelatedIds,String wxEnterpriseId,String storeId,Integer version,String clerkIds,String staffId) {
 		if(version != null && version == 1){
-			if(needAudit){
+			AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
+			if(dto.getClerkChangeFlag() == 1){
+				//需要审核
 				com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(storeId);
 				//校验手机是否唯一
 				if (store == null) {
@@ -394,37 +391,37 @@ public class ClerkController extends WebBaseController{
 		}
 		
 		
-		DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(storeId);
-		if(departmentDTO == null){
-			return resultResponse(HaoBanErrCode.ERR_10009);
-		}
-		if(StringUtils.isBlank(staffDepartmentRelatedIds)){
-			return resultResponse(HaoBanErrCode.ERR_2);
-		}
-		String[] staffDepartmentRelatedIdArr = staffDepartmentRelatedIds.split(",");
-		boolean flag = false;
-		for (String staffDepartmentRelatedId : staffDepartmentRelatedIdArr) {
-			StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
-			if(related == null){
-				flag = true;
-				continue;
-			}
-			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){
-					if(clerk.getClerkType() == 1){
-						continue;
-					}
-					syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
-					staffApiService.del(staffDepartmentRelatedId);
-				}
-			}
-		}
-		if(flag){
-			return resultResponse(HaoBanErrCode.ERR_999);
-		}
+//		DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(storeId);
+//		if(departmentDTO == null){
+//			return resultResponse(HaoBanErrCode.ERR_10009);
+//		}
+//		if(StringUtils.isBlank(staffDepartmentRelatedIds)){
+//			return resultResponse(HaoBanErrCode.ERR_2);
+//		}
+//		String[] staffDepartmentRelatedIdArr = staffDepartmentRelatedIds.split(",");
+//		boolean flag = false;
+//		for (String staffDepartmentRelatedId : staffDepartmentRelatedIdArr) {
+//			StaffDepartmentRelatedDTO related = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
+//			if(related == null){
+//				flag = true;
+//				continue;
+//			}
+//			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){
+//					if(clerk.getClerkType() == 1){
+//						continue;
+//					}
+//					syncHaobanToGicServiceApi.delGicClerk(clerk.getClerkId());
+//					staffApiService.del(staffDepartmentRelatedId);
+//				}
+//			}
+//		}
+//		if(flag){
+//			return resultResponse(HaoBanErrCode.ERR_999);
+//		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}