111

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

@@ -230,7 +230,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,1, tab);
 				}
-				staffDepartmentRelatedApiService.sendClerkAdd(obj.getEnterpriseId(), obj.getClerkCode(), 1, "");
+				staffDepartmentRelatedApiService.sendClerkAdd(tab.getEnterpriseId(), obj.getClerkCode(), 1, "");
 			}
 
 		}else if(auditType == AuditType.CLERK_DEL.getCode()){
@@ -261,6 +261,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		TabHaobanAudit tab2 = auditMapper.selectByPrimaryKey(auditId);
 		int auditType = tab2.getAuditType();
 		String oldValue = tab2.getOldValue();
+		String enterpriseId = tab2.getEnterpriseId();
 		AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
 		//发送消息
 		if(auditType == AuditType.STORE_CHANGE.getCode()){
@@ -274,7 +275,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		}else if(auditType == AuditType.CLERK_BIND.getCode()){
 			staffDepartmentRelatedApiService.sendClerkBind(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_ADD.getCode()) {
-			staffDepartmentRelatedApiService.sendClerkAdd(obj.getEnterpriseId(), obj.getClerkCode(), 2, auditReason);
+			staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkId(), obj.getClerkCode(), 2, auditReason);
 		}

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

@@ -195,7 +195,7 @@ public class AuditController extends WebBaseController{
 		String oldValue = audit.getOldValue();
 		JSONObject json = JSON.parseObject(oldValue);
 		String clerkCode = json.get("clerkCode")==null?"":json.get("clerkCode").toString();
-		String enterpriseId = json.getString("enterpriseId")==null?"":json.get("enterpriseId").toString();
+		String enterpriseId = audit.getEnterpriseId();
 		String clerkId = json.getString("clerkId")==null?"":json.get("clerkId").toString();
 		String wxUserId = json.getString("wxUserId")==null?"":json.get("wxUserId").toString();
 		Integer sex  = json.getInteger("sex")==null?0:json.getInteger("sex");