fix

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

@@ -190,6 +190,7 @@ public class AuditController extends WebBaseController{
 				audit.setAuditStatus(1);
 			}
 		}else if(auditStatus == 2){
+			audit.setAuditReason(auditReason);
 			audit.setAuditStatus(2);
 		}else if(auditStatus == 3){
 			audit.setAuditStatus(3);

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

@@ -522,23 +522,16 @@ public class ClerkController extends WebBaseController{
 		}
 		StoreDTO store = storeService.getStore(clerk.getStoreId());
 		AuditDTO audit = new AuditDTO();
-		//店长提交  默认是审核通过
-		if(commitType == 1){
-			ClerkDTO storeManager = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
-			audit.setCommitName(storeManager.getClerkName());
-			audit.setAuditStatus(1);
-			//audit.setCommitStaffId(commitStaffId);
-			audit.setCommitStoreId(clerk.getStoreId());
-			//audit.setAuditName(auditName);
-			audit.setAuditStatus(1);
-			//audit.seta
-		}else{
-			audit.setCommitName(clerk.getClerkName());
-			audit.setCommitStaffId(staffId);
-			audit.setCommitStaffImg(staff.getHeadImg());
-			audit.setCommitStoreId(clerk.getStoreId());
-			audit.setCommitStoreName(store.getStoreName());
-			audit.setAuditStatus(0);
+		audit.setCommitName(clerk.getClerkName());
+		audit.setCommitStaffId(staffId);
+		audit.setCommitStaffImg(staff.getHeadImg());
+		audit.setCommitStoreId(clerk.getStoreId());
+		audit.setCommitStoreName(store.getStoreName());
+		audit.setAuditStatus(0);
+		
+		StaffClerkRelationDTO staffClerkRelation  = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode,store.getEnterpriseId());
+		if(staffClerkRelation != null){
+			return resultResponse(HaoBanErrCode.ERR_111117);
 		}
 		
 		JSONObject json = new JSONObject();
@@ -549,6 +542,7 @@ public class ClerkController extends WebBaseController{
 		json.put("staffId", staffId);
 		json.put("wxUserId", wxUserId);
 		json.put("headPic", staff.getHeadImg());
+		json.put("enterpriseId", clerk.getEnterpriseId());
 		audit.setOldValue(json.toJSONString());
 		audit.setCommitTime(new Date());