| @@ -87,6 +87,7 @@ public class WxMerchantController extends BaseController { | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | wxMerchant.updateTenantInfo(getTenantInfo()); | ||||
| wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | ||||
| wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); | wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); | ||||
| wxMerchant.setNoCarVendor(1); | |||||
| final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); | final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -121,6 +121,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/jieshunCarCallback/**", "anon"); | filterChainDefinitionMap.put("/jieshunCarCallback/**", "anon"); | ||||
| filterChainDefinitionMap.put("/cyfCarCallback/**", "anon"); | filterChainDefinitionMap.put("/cyfCarCallback/**", "anon"); | ||||
| filterChainDefinitionMap.put("/hkwsCarCallback/**", "anon"); | filterChainDefinitionMap.put("/hkwsCarCallback/**", "anon"); | ||||
| filterChainDefinitionMap.put("/futeCarCallback/**", "anon"); | |||||
| // static files | // static files | ||||
| filterChainDefinitionMap.put("/css/**", "anon"); | filterChainDefinitionMap.put("/css/**", "anon"); | ||||
| @@ -408,5 +408,7 @@ public class WxMerchant extends TenantEntity { | |||||
| //查询停车商户根据此字段 | //查询停车商户根据此字段 | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer hasCarVendor; | private Integer hasCarVendor; | ||||
| @TableField(exist = false) | |||||
| private Integer noCarVendor; | |||||
| } | } | ||||
| @@ -108,6 +108,10 @@ | |||||
| <if test=" null != hasCarVendor "> | <if test=" null != hasCarVendor "> | ||||
| and m.`car_vendor_type` is not null and m.`car_vendor_type` > 0 | and m.`car_vendor_type` is not null and m.`car_vendor_type` > 0 | ||||
| </if> | </if> | ||||
| <if test=" null != noCarVendor "> | |||||
| and (m.`car_vendor_type` = 0 or m.`car_vendor_type` is null) | |||||
| </if> | |||||
| <if test=" null != businessId "> | <if test=" null != businessId "> | ||||
| and m.`business_id` = #{businessId} | and m.`business_id` = #{businessId} | ||||