Huanyi hace 12 horas
padre
commit
e1f145eecf

+ 3 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java

@@ -213,8 +213,9 @@ public class SysTenantController extends BaseController {
     }
 
     @GetMapping("/listOnStore")
-    public TableDataInfo<SysTenantOnStoreVo> listOnStore(PageQuery pageQuery) {
-        return tenantService.listOnStore(pageQuery);
+    public TableDataInfo<SysTenantOnStoreVo> listOnStore(PageQuery pageQuery,
+                                                         @RequestParam(required = false) String name) {
+        return tenantService.listOnStore(pageQuery, name);
     }
 
     @GetMapping("/getInfo")

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java

@@ -93,7 +93,7 @@ public interface ISysTenantService {
      */
     void syncTenantConfig();
 
-    TableDataInfo<SysTenantOnStoreVo> listOnStore(PageQuery pageQuery);
+    TableDataInfo<SysTenantOnStoreVo> listOnStore(PageQuery pageQuery, String name);
 
     boolean updateOnMerchant(SysTenantEditOnMerchantBo bo);
 

+ 2 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -613,12 +613,13 @@ public class SysTenantServiceImpl implements ISysTenantService {
     }
 
     @Override
-    public TableDataInfo<SysTenantOnStoreVo> listOnStore(PageQuery pageQuery) {
+    public TableDataInfo<SysTenantOnStoreVo> listOnStore(PageQuery pageQuery, String name) {
 
         Page<SysTenant> page = baseMapper.selectPage(
             pageQuery.build(),
             Wrappers.lambdaQuery(SysTenant.class)
                 .ne(SysTenant::getTenantId, TenantConstants.DEFAULT_TENANT_ID)
+                .like(StringUtils.isNotBlank(name), SysTenant::getCompanyName, name)
                 .orderByDesc(SysTenant::getId)
         );
         return TableDataInfo.build(page.convert(e -> {

+ 0 - 6
ruoyi-modules/yingpaipay-fulfiller/pom.xml

@@ -128,12 +128,6 @@
             <version>1.80</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-system</artifactId>
-            <version>2.5.3</version>
-            <scope>compile</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>