门店查询

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -15,7 +15,6 @@ public interface WxEnterpriseRelatedApiService {
 	 */
 	List<String> findAllEnterpriseId();
 	
-	@Deprecated
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
 	
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber);

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

@@ -489,11 +489,13 @@ public class AuditApiServiceImpl implements AuditApiService {
     @SuppressWarnings("unchecked")
     public List<String> getStoreIdList(String enterpriseId , String clerkId) {
         EnterpriseSettingDTO enterpriseSetting =  enterpriseService.getEnterpriseSettingByEnterpriseId(enterpriseId) ;
+        logger.info("门店权限,getEnableAccessControl={},{}",enterpriseSetting.getEnableAccessControl(),enterpriseId);
         if (enterpriseSetting.getEnableAccessControl() != null && enterpriseSetting.getEnableAccessControl() == 1) {
             String storeWidgetKey = this.powerService.getStoreWidgetId(new Date() , clerkId) ;
             logger.info("权限控制-启用,创建人管辖门店的组件={}",storeWidgetKey);
             StoreWidgetDTO widget = this.storeWidgetService.getStoreWidgetBykey(storeWidgetKey) ;
             if(null == widget || widget.getSelectType()==0) {
+                logger.info("权限控制-启用,超管={}",clerkId);
                 return null ;
             }
             List<String> storeIdList = new ArrayList<>() ;

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

@@ -154,7 +154,7 @@
 			 <if test = "auditStatus != null">
 	          and audit_status = #{auditStatus,jdbcType=INTEGER}
 			 </if>
-			 <if test=" null != searchParams">
+			 <if test=" null != searchParams and  '' !=searchParams ">
 			 	and (commit_staff_name like '%${searchParams}%' or commit_store_name like '%${searchParams}%')
 			 </if>
    	   	    <include refid="storeSql"/>