问题处理

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

@@ -2,7 +2,6 @@ package com.fjhx.account.service.account.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -75,7 +74,7 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
     public Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()), "arf.type", dto.getType());
-        wrapper.in(StrUtil.isBlank(dto.getStatus()), "arf.status", Arrays.asList(dto.getStatus().split(",")));
+        wrapper.in(ObjectUtil.isNotEmpty(dto.getStatus()), "arf.status", Arrays.asList(dto.getStatus().split(",")));
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()), "ap.status", dto.getPaymentStatus());
         wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "arf.payment_remarks", dto.getKeyword());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getWriteOffStatus()), "arf.write_off_status", dto.getWriteOffStatus());

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailServiceImpl.java

@@ -58,6 +58,8 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t3.`code`"), new SqlField("t2.`product_name`"));
         }
+        wrapper.groupBy("t1.pack_id");
+        wrapper.orderByDesc("t1.create_time");
         Page<PackDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -17,8 +17,6 @@
                t1.shipment_time,
                t1.contract_ids
         FROM pack_detail t1
-        GROUP BY t1.pack_id
-        ORDER BY t1.create_time DESC
             ${ew.customSqlSegment}
     </select>