From 29bd4d946349eacd38442c07ebf15b470af92e82 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 14:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/resources/TOperatorUserMapper.xml |   34 +---------------------------------
 1 files changed, 1 insertions(+), 33 deletions(-)

diff --git a/cloud-server-management/src/main/resources/TOperatorUserMapper.xml b/cloud-server-management/src/main/resources/TOperatorUserMapper.xml
index 340f060..224b958 100644
--- a/cloud-server-management/src/main/resources/TOperatorUserMapper.xml
+++ b/cloud-server-management/src/main/resources/TOperatorUserMapper.xml
@@ -1,37 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsh.course.mapper.TOperatorUserMapper">
-    <select id="listAll" resultType="java.util.Map">
-        select t1.id as id, t1.platform,t1.type,t1.proportion,CONCAT(t1.province,t1.city) as provinceAndCity
-        t1.state as state,t1.status as status,t2.name as userName,t2.phone as phone from t_operatorUser t1
-        left join sys_user t2 on t1.userId = t2.id
-        where 1=1
-        <if test="province != null and province != ''">
-            and t1.provinceCode =  #{province}
-        </if>
-        <if test="city != null and city != ''">
-            and t1.cityCode =  #{city}
-        </if>
-        <if test="userName != null and userName != ''">
-            and t2.name like CONCAT('%',#{userName},'%')
-        </if>
-        <if test="phone != null and phone != ''">
-            and t2.phone like CONCAT('%',#{phone},'%')
-        </if>
-        <if test="platform != null and platform != ''">
-            and t1.platform =  #{platform}
-        </if>
-        <if test="type != null and type != ''">
-            and t1.type =  #{type}
-        </if>
-        <if test="proportion != null and proportion != ''">
-            and t1.proportion =  #{proportion}
-        </if>
-        <if test="state != null and state != ''">
-            and t1.state =  #{state}
-        </if>
-        <if test="status != null and status != ''">
-            and t1.status =  #{status}
-        </if>
-    </select>
+
 </mapper>

--
Gitblit v1.7.1