优化

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/mapper/PtUserAccountMapper.java

@@ -11,6 +11,7 @@ import org.checkerframework.checker.units.qual.C;
 import org.dromara.backstage.basics.domain.PtOperator;
 import org.dromara.backstage.basics.domain.vo.PtOperatorVo;
 import org.dromara.backstage.payment.domain.PtUserAccount;
+import org.dromara.backstage.payment.domain.bo.PtUserAccountBo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -28,7 +29,7 @@ import java.util.List;
  */
 public interface PtUserAccountMapper extends BaseMapperPlus<PtUserAccount, PtUserAccountVo> {
 
-    Page<PtUserAccount4SelectVo> customPageList(@Param("page") Page<PtUserAccount> page, @Param("ew") Wrapper<PtUserAccount> wrapper);
+    Page<PtUserAccount4SelectVo> customPageList(Page<PtUserAccount> page, @Param("bo") PtUserAccountBo bo);
 
     @Override
     @DataPermission({

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.backstage.cardCenter.domain.bo.PtCardBo;
@@ -93,14 +94,14 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
     @Override
     public TableDataInfo<PtUserAccount4SelectVo> queryPageList4Select(PtUserAccountBo bo, PageQuery pageQuery) {
         // 方法1. 使用子查询，使得where 后 只有一个表(效率会低点) 方法2. 使用queryWrapper 自己指定字段，字段名带表别名
-        QueryWrapper<PtUserAccount> wrapper = buildQueryWrapper4Select(bo, "u");
-        wrapper.eq("u.del_flag","0");
-        wrapper.eq("a.del_flag","0");
-        if(bo.getDeptId() != null){
-            wrapper.and(wrapper1 -> wrapper1.eq("u.dept_id", bo.getDeptId()).or().like("a.ancestors", bo.getDeptId()));
-        }
-        wrapper.orderByAsc("u.dept_id").orderByAsc("u.create_time");
-        Page<PtUserAccount4SelectVo> result = baseMapper.customPageList(pageQuery.build(), wrapper);
+//        QueryWrapper<PtUserAccount> wrapper = buildQueryWrapper4Select(bo, "u");
+//        wrapper.eq("u.del_flag","0");
+//        wrapper.eq("a.del_flag","0");
+//        if(bo.getDeptId() != null){
+//            wrapper.and(wrapper1 -> wrapper1.eq("u.dept_id", bo.getDeptId()).or().like("a.ancestors", bo.getDeptId()));
+//        }
+//        wrapper.orderByAsc("u.dept_id").orderByAsc("u.create_time");
+        Page<PtUserAccount4SelectVo> result = baseMapper.customPageList(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }
 

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/PtUserAccountMapper.xml

@@ -48,7 +48,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="customPageList" resultType="org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo">
         select u.user_name,u.user_id,u.dept_id,u.real_name,u.user_numb,u.phone,u.account_status,u.freeze_status,u.status,a.dept_name deptName
-        from t_pt_userAccount u left join t_sys_dept a
-        on u.dept_id = a.dept_id ${ew.customSqlSegment}
+        from t_pt_userAccount u
+            left join t_sys_dept a on u.dept_id = a.dept_id
+        <where>
+            u.del_flag = 0 and a.del_flag = 0
+            <if test="bo.category != null and bo.category != ''">
+               and u.category = #{bo.category}
+            </if>
+            <if test="bo.deptId != null and  bo.deptId != ''">
+                and ( u.dept_id = #{bo.deptId} or a.ancestors like concat('%',#{bo.deptId},'%'))
+            </if>
+            <if test="bo.realName != null and  bo.realName != ''">
+                and u.real_name = #{bo.realName}
+            </if>
+            <if test="bo.userNumb != null and  bo.userNumb != ''">
+                and u.user_numb = #{bo.userNumb}
+            </if>
+        </where>
+        order by u.dept_id,u.user_id
     </select>
 </mapper>