审批sql

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -51,7 +51,7 @@
       #{newValue,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=VARCHAR}, 
       #{auditName,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, #{auditReason,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{statusFlag,jdbcType=INTEGER}, 
-      #{wxEnterpriseId,jdbcType=VARCHAR},#{relatedId,jdbcType=VARCHAR},#{auditStaffId,jdbcType=VARCHAR}) , #{commitStoreName}
+      #{wxEnterpriseId,jdbcType=VARCHAR},#{relatedId,jdbcType=VARCHAR},#{auditStaffId,jdbcType=VARCHAR} , #{commitStoreName} )
   </insert>
   
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanAudit" >

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

@@ -72,13 +72,12 @@ public class AuditController extends WebBaseController{
 	}
 	//分页查找
 	@RequestMapping("find-page")
-	public HaobanResponse findPage(String wxEnterpriseId,String enterpriseId,String search,BasePageInfo pageInfo ,Integer auditType,Integer auditStatus,Integer auditFlag ) {
+	public HaobanResponse findPage(String wxEnterpriseId,String search,BasePageInfo pageInfo ,Integer auditType,Integer auditStatus,Integer auditFlag ) {
 		if(auditFlag == null){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
-		if(StringUtils.isAnyBlank(wxEnterpriseId)){
-			return resultResponse(HaoBanErrCode.ERR_2);
-		}
+		WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser() ;
+		String enterpriseId = loginUser.getEnterpriseId() ;
 		String clerkId = AuthWebRequestUtil.getLoginUser().getClerkId() ;
 		Page<AuditDTO> page = auditApiService.page(auditType, search, wxEnterpriseId,enterpriseId, auditStatus,auditFlag, pageInfo ,clerkId);
 		List<AuditDTO> list = page.getResult();
@@ -103,7 +102,6 @@ public class AuditController extends WebBaseController{
 					String newValue = dto.getNewValue();
 					JSONObject oldJSONObject = JSONObject.parseObject(oldValue);
 					String oldAddress = oldJSONObject.get("storeAddress").toString();
-					
 					JSONObject newJSONObject = JSONObject.parseObject(newValue);
 					String newAddress = newJSONObject.get("storeAddress").toString();
 					detail = "将"+"门店地址"+"\""+oldAddress+"\""+"修改为"+"\""+newAddress+"\"";