Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.service.entity.TabHaobanAudit;
 import com.github.pagehelper.Page;
 
@@ -18,7 +20,7 @@ public interface TabHaobanAuditMapper {
 
     int updateByPrimaryKey(TabHaobanAudit record);
     
-    Page<TabHaobanAudit> page(Integer auditType, List<String> storeIds,List<String>staffIds,String wxEnterpriseId, String enterpriseId,Integer auditStatus );
+    Page<TabHaobanAudit> page(@Param("auditType")Integer auditType, @Param("storeIds")List<String> storeIds,@Param("staffIds")List<String>staffIds,@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseId")String enterpriseId,@Param("auditStatus")Integer auditStatus );
     
     List<TabHaobanAudit> listByStoreId(String storeId);
     

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

@@ -283,13 +283,13 @@
 			 <if test = "enterpriseId != null">
 	          and enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
 			 </if>
-	    	<if test = "audit_type != null">
+	    	<if test = "auditType != null">
 	          and audit_type = #{auditType,jdbcType=INTEGER}
 			 </if>
-	    	<if test = "audit_status != null and audit_status == 0">
+	    	<if test = "auditStatus != null and auditStatus == 0">
 	          and audit_status = 0
 			 </if>
-			<if test = "audit_status != null and audit_status != 0">
+			<if test = "auditStatus != null and auditStatus != 0">
 	          and audit_status in (1,2)
 			 </if>
    	   	    <include refid="storeSql"/>

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

@@ -69,6 +69,9 @@ public class AuditController extends WebBaseController{
 		if(auditStatus == null){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		if(StringUtils.isAnyBlank(wxEnterpriseId)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
 		Page<AuditDTO> page = auditApiService.page(auditType, search, wxEnterpriseId,enterpriseId, auditStatus, pageInfo);
 		return resultResponse(HaoBanErrCode.ERR_1,page);
 	}