From 2e5ec4c7c528437a20fd7212096dedd26ed0f5cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:36:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml
index 0395afd..6184c2e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml
@@ -9,8 +9,8 @@
<result column="branch_name" property="branchName" />
<result column="user_name" property="userName" />
<result column="phone" property="phone" />
- <result column="money_commiss" property="moneyCommiss" />
- <result column="points_commiss" property="pointsCommiss" />
+ <result column="money_commission" property="moneyCommission" />
+ <result column="points_commission" property="pointsCommission" />
<result column="user_points" property="userPoints" />
<result column="status" property="status" />
<result column="create_time" property="createTime" />
@@ -22,7 +22,34 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, user_id, branch_name, user_name, phone, money_commiss, points_commiss, user_points, status, create_time, update_time, create_by, update_by, disabled
+ id, user_id, branch_name, user_name, phone, money_commission, points_commission, user_points, status, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TCrmBranchVO">
+ select id, user_id, branch_name, user_name, phone, money_commission, points_commission,
+ user_points, status, create_time, update_time, create_by, update_by, disabled
+ from t_crm_branch
+ <where>
+ <if test="query.branchName != null and query.branchName != ''">
+ and branch_name like concat('%',#{query.branchName},'%')
+ </if>
+ <if test="query.userName != null and query.userName != ''">
+ and user_name like concat('%',#{query.userName},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.status != null">
+ and status = #{query.status}
+ </if>
+ <if test="query.branchIds != null and query.branchIds.size()>0">
+ and id in
+ <foreach item="item" collection="query.branchIds" separator="," open="(" close=")" index="">
+ #{item}
+ </foreach>
+ </if>
+ AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1