修改了打款的列表

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -46,12 +46,13 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         LambdaQueryWrapper<AccountManagement> wrapper = Wrappers.<AccountManagement>lambdaQuery();
         //根据关键字查询（查询的字段有账户别名、账户名称、账号）
         if (StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.like(AccountManagement::getName,dto.getKeyword());
-            wrapper.like(AccountManagement::getAlias,dto.getKeyword());
-            wrapper.like(AccountManagement::getAccountOpening,dto.getOpeningBank());
+            wrapper.and(wrapper1 ->{
+                wrapper1.like(AccountManagement::getName,dto.getKeyword()).or()
+                .like(AccountManagement::getAlias,dto.getKeyword()).or()
+                .like(AccountManagement::getAccountOpening,dto.getOpeningBank()).or()
+                        .like(AccountManagement::getOpeningBank,dto.getKeyword());
+            } );
         }
-        //根据开户银行查询
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getOpeningBank()),AccountManagement::getOpeningBank,dto.getOpeningBank());
         Page<AccountManagementVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -35,7 +35,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arw.status", dto.getStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
-            wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("am.name", dto.getKeyword()));
+            wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
         }
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;