From 2eca6f2d820653330ddf28fe5e3a641e19840c27 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 18 七月 2023 17:22:11 +0800
Subject: [PATCH] 修改资源的Mapper.xml

---
 src/main/java/com/moon/server/controller/all/PermsController.java |    4 ++--
 src/main/resources/mapper/sys/ResMapper.xml                       |   14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/moon/server/controller/all/PermsController.java b/src/main/java/com/moon/server/controller/all/PermsController.java
index 2ecc464..84bd265 100644
--- a/src/main/java/com/moon/server/controller/all/PermsController.java
+++ b/src/main/java/com/moon/server/controller/all/PermsController.java
@@ -181,7 +181,7 @@
         }
     }
 
-    @SysLog()
+    /*@SysLog()
     @ApiOperation(value = "鏌ヨ鎵�鏈夊浘灞�")
     @GetMapping(value = "/selectLayers")
     public ResponseMsg<Object> selectLayers(HttpServletRequest req) {
@@ -197,5 +197,5 @@
         } catch (Exception ex) {
             return fail(ex, null);
         }
-    }
+    }*/
 }
diff --git a/src/main/resources/mapper/sys/ResMapper.xml b/src/main/resources/mapper/sys/ResMapper.xml
index 3b1913b..0d41ade 100644
--- a/src/main/resources/mapper/sys/ResMapper.xml
+++ b/src/main/resources/mapper/sys/ResMapper.xml
@@ -5,7 +5,7 @@
         select count(*) from lf.sys_res
         <where>
             <if test="name != null">
-                upper(name) like #{name}
+                upper(cn_name) like #{name} or upper(en_name) like #{name}
             </if>
         </where>
     </select>
@@ -14,19 +14,23 @@
         select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName from lf.sys_res a
         <where>
             <if test="name != null">
-                upper(a.name) like #{name}
+                upper(cn_name) like #{name} or upper(en_name) like #{name}
             </if>
         </where>
         order by a.id desc
-        limit #{limit} offset #{offset}
+        limit #{limit} offset #{offset};
     </select>
 
     <select id="selectAll" resultType="com.moon.server.entity.sys.ResEntity">
-        select * from lf.sys_res order by id desc;
+        select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName
+        from lf.sys_res a
+        order by id desc;
     </select>
 
     <select id="selectById" resultType="com.moon.server.entity.sys.ResEntity">
-        select * from lf.sys_res where id = #{id};
+        select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName
+        from lf.sys_res a
+        where id = #{id};
     </select>
 
     <select id="selectCountForRole" resultType="java.lang.Integer">

--
Gitblit v1.9.3