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

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

@@ -621,32 +621,32 @@ public class ClerkController extends WebBaseController{
 		}
 		
 		//解绑无需审核，只插入记录即可
-		AuditDTO audit = new AuditDTO();
-		audit.setCommitStaffName(clerk.getClerkName());
-		audit.setCommitStaffId(staffId);
-		audit.setCommitStaffImg(staff.getHeadImg());
-		audit.setCommitStoreId(clerk.getStoreId());
-		audit.setCommitStoreName(store.getStoreName());
-		audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
-		audit.setWxEnterpriseId(staffClerkRelation.getWxEnterpriseId());
-		audit.setEnterpriseId(store.getEnterpriseId());
-		audit.setStatusFlag(1);
-		audit.setRelatedId(staffId);
-		audit.setRelatedId(clerkId);
-		audit.setAuditName(staff.getStaffName());
-		
-		JSONObject json = new JSONObject();
-		json.put("clerkId", clerkId);
-		json.put("clerkCode", clerkCode);
-		json.put("clerkName", clerk.getClerkName());
-		json.put("staffName", staff.getStaffName());
-		json.put("staffId", staffId);
-		json.put("headPic", staff.getHeadImg());
-		audit.setOldValue(json.toJSONString());
-		audit.setCommitTime(new Date());
-		audit.setAuditName(staff.getStaffName());
-		audit.setAuditType(5);
-		auditApiService.insert(audit);
+//		AuditDTO audit = new AuditDTO();
+//		audit.setCommitStaffName(clerk.getClerkName());
+//		audit.setCommitStaffId(staffId);
+//		audit.setCommitStaffImg(staff.getHeadImg());
+//		audit.setCommitStoreId(clerk.getStoreId());
+//		audit.setCommitStoreName(store.getStoreName());
+//		audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
+//		audit.setWxEnterpriseId(staffClerkRelation.getWxEnterpriseId());
+//		audit.setEnterpriseId(store.getEnterpriseId());
+//		audit.setStatusFlag(1);
+//		audit.setRelatedId(staffId);
+//		audit.setRelatedId(clerkId);
+//		audit.setAuditName(staff.getStaffName());
+//		
+//		JSONObject json = new JSONObject();
+//		json.put("clerkId", clerkId);
+//		json.put("clerkCode", clerkCode);
+//		json.put("clerkName", clerk.getClerkName());
+//		json.put("staffName", staff.getStaffName());
+//		json.put("staffId", staffId);
+//		json.put("headPic", staff.getHeadImg());
+//		audit.setOldValue(json.toJSONString());
+//		audit.setCommitTime(new Date());
+//		audit.setAuditName(staff.getStaffName());
+//		audit.setAuditType(5);
+//		auditApiService.insert(audit);
 		
 		staffClerkRelationApiService.delByStoreIdAndCode(storeId, clerkCode);
 		return resultResponse(HaoBanErrCode.ERR_1);