From 18b0beec7bf9b755e5d2cc0116bccb0ee2403996 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 九月 2023 10:17:57 +0800
Subject: [PATCH] 修改标绘接口

---
 src/main/resources/mapper/show/MarkMapper.xml |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/show/MarkMapper.xml b/src/main/resources/mapper/show/MarkMapper.xml
index 989ac27..4042f5b 100644
--- a/src/main/resources/mapper/show/MarkMapper.xml
+++ b/src/main/resources/mapper/show/MarkMapper.xml
@@ -4,8 +4,12 @@
     <select id="selectCount" resultType="java.lang.Integer">
         select count(*) from lf.sys_mark
         <where>
+            1 = 1
+            <if test="name != null">
+                and upper(name) like #{name}
+            </if>
             <if test="userid != null">
-                create_user = #{userid}
+                and create_user = #{userid}
             </if>
         </where>
     </select>
@@ -13,20 +17,36 @@
     <select id="selectByPage" resultType="com.moon.server.entity.show.MarkEntity">
         select * from lf.sys_mark
         <where>
+            1 = 1
+            <if test="name != null">
+                and upper(name) like #{name}
+            </if>
+            <if test="userid != null">
+                and create_user = #{userid}
+            </if>
+        </where>
+        order by id desc
+        limit #{limit} offset #{offset};
+    </select>
+
+    <select id="selectAll" resultType="com.moon.server.entity.show.MarkEntity">
+        select * from lf.sys_mark
+        <where>
             <if test="userid != null">
                 create_user = #{userid}
             </if>
         </where>
-        order by id desc
-        limit #{limit} offset #{offset}
-    </select>
-
-    <select id="selectAll" resultType="com.moon.server.entity.show.MarkEntity">
-        select * from lf.sys_mark order by id desc
+        order by id desc;
     </select>
 
     <select id="selectById" resultType="com.moon.server.entity.show.MarkEntity">
-        select * from lf.sys_mark where id = #{id}
+        select * from lf.sys_mark
+        <where>
+            id = #{id}
+            <if test="userid != null">
+                and create_user = #{userid}
+            </if>
+        </where>
     </select>
 
     <insert id="insert" parameterType="com.moon.server.entity.show.MarkEntity">
@@ -46,20 +66,32 @@
     </insert>
 
     <delete id="delete">
-        delete from lf.sys_mark where id = #{id}
+        delete from lf.sys_mark
+        <where>
+            id = #{id}
+            <if test="userid != null">
+                and create_user = #{userid}
+            </if>
+        </where>
     </delete>
 
     <delete id="deletes">
-        delete from lf.sys_mark where id in
-        <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        delete from lf.sys_mark
+        <where>
+            id in
+            <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            <if test="userid != null">
+                and create_user = #{userid}
+            </if>
+        </where>
     </delete>
 
     <update id="update">
         update lf.sys_mark
         set name=#{name},wkt=#{wkt},update_user=#{updateUser},update_time=now()
-        where id=#{id}
+        where create_user = #{createUser} and id = #{id};
     </update>
 
     <update id="updates">
@@ -68,7 +100,7 @@
             <set>
                 name=#{item.name},wkt=#{item.wkt},update_user=#{item.updateUser},update_time=now()
             </set>
-            where id = #{item.id}
+            where create_user = #{createUser} and id = #{item.id};
         </foreach>
     </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3