bugfix:营业员，结算账户查询报错

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/mapper/PtOperatorMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.backstage.basics.domain.PtOperator;
+import org.dromara.backstage.basics.domain.bo.PtOperatorBo;
 import org.dromara.backstage.basics.domain.vo.PtOperatorVo;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -21,6 +22,6 @@ public interface PtOperatorMapper extends BaseMapperPlus<PtOperator, PtOperatorV
 
     PtOperatorVo selectVoById(Long id);
 
-    Page<PtOperatorVo> customPageList(@Param("page") Page<PtOperator> page, @Param("ew") Wrapper<PtOperator> wrapper);
+    Page<PtOperatorVo> customPageList(@Param("page") Page<PtOperator> page, @Param("bo") PtOperatorBo bo);
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtOperatorServiceImpl.java

@@ -52,8 +52,8 @@ public class PtOperatorServiceImpl implements IPtOperatorService {
      */
     @Override
     public TableDataInfo<PtOperatorVo> queryPageList(PtOperatorBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<PtOperator> lqw = buildQueryWrapper(bo);
-        Page<PtOperatorVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
+//        LambdaQueryWrapper<PtOperator> lqw = buildQueryWrapper(bo);
+        Page<PtOperatorVo> result = baseMapper.customPageList(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }
 
@@ -77,7 +77,7 @@ public class PtOperatorServiceImpl implements IPtOperatorService {
         lqw.eq(bo.getCardNumber() != null, PtOperator::getCardNumber, bo.getCardNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getFactoryId()), PtOperator::getFactoryId, bo.getFactoryId());
         lqw.eq(bo.getLifespan() != null, PtOperator::getLifespan, bo.getLifespan());
-        lqw.eq(StringUtils.isNotBlank(bo.getAccountName()), PtOperator::getAccountName, bo.getAccountName());
+//        lqw.eq(StringUtils.isNotBlank(bo.getAccountName()), PtOperator::getAccountName, bo.getAccountName());
         return lqw;
     }
 

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/merchant/PtOperatorMapper.xml

@@ -41,6 +41,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="customPageList" resultType="org.dromara.backstage.basics.domain.vo.PtOperatorVo">
-        SELECT o.*,a.account_name FROM t_pt_operator o left join t_pt_account a on o.account_id = a.account_id and o.del_flag = '0' ${ew.customSqlSegment}
+        SELECT o.*,a.account_name FROM t_pt_operator o left join t_pt_account a on o.account_id = a.account_id
+        <where>
+            o.del_flag = '0' and a.del_flag = '0'
+            <if test="bo.accountName != null and bo.accountName != ''">
+                and a.account_name like concat('%',#{bo.accountName},'%')
+            </if>
+            <if test="bo.operatorName != null and bo.operatorName != ''">
+                and o.operatorName like concat('%',#{bo.operatorName},'%')
+            </if>
+            <if test="bo.cardNumber != null">
+                and o.card_number = #{bo.cardNumber}
+            </if>
+            <if test="bo.factoryId !=null and bo.factoryId != ''">
+                and o.factory_id = #{bo.factoryId}
+            </if>
+            <if test="bo.lifespan != null">
+                and to_char(o.lifespan,'%Y-%m-%d') &lt;= #{bo.lifespan}
+            </if>
+
+        </where>
     </select>
 </mapper>