3 Commits 499c2758dd ... f1051e0d20

Author SHA1 Message Date
  lgl f1051e0d20 Merge branch 'master' into dev-lgl 5 months ago
  ly e9317113e6 岗位管理 状态搜索bug 问题修复 5 months ago
  ly f37d3a0fd9 角色管理 5 months ago

+ 1 - 1
src/main/resources/mapper/SysPostInfoDao.xml

@@ -156,7 +156,7 @@
156
                 and post_name like '%'+#{postName}+'%'
156
                 and post_name like '%'+#{postName}+'%'
157
             </if>
157
             </if>
158
             <if test="status != null and status != ''">
158
             <if test="status != null and status != ''">
159
-                and status = #{status}
159
+                and p.status = #{status}
160
             </if>
160
             </if>
161
         </where>
161
         </where>
162
         <choose>
162
         <choose>

+ 2 - 2
src/main/resources/mapper/SysRoleInfoDao.xml

@@ -25,10 +25,10 @@
25
             and sign like ('%'+#{sign}+'%')
25
             and sign like ('%'+#{sign}+'%')
26
         </if>
26
         </if>
27
         <if test="name != null and name != ''">
27
         <if test="name != null and name != ''">
28
-            and name like ('%'+#{name}+'%')
28
+            and r.NAME like ('%'+#{name}+'%')
29
         </if>
29
         </if>
30
         <if test="status != null and status != ''">
30
         <if test="status != null and status != ''">
31
-            and status = #{status}
31
+            and r.status = #{status}
32
         </if>
32
         </if>
33
         <choose>
33
         <choose>
34
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
34
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">

+ 1 - 1
src/main/resources/templates/roleinfo/list.html

@@ -128,7 +128,7 @@
128
             cols: [
128
             cols: [
129
                 [
129
                 [
130
                     {type: "checkbox", fixed: 'left'},
130
                     {type: "checkbox", fixed: 'left'},
131
-                    {type: 'numbers', fixed: 'left'},
131
+                    {type: 'numbers', fixed: 'left',title: '序号'},
132
                     {field: 'name', width: '10%', title: '名称'},
132
                     {field: 'name', width: '10%', title: '名称'},
133
                     {field: 'sign', width: '10%', title: '标志'},
133
                     {field: 'sign', width: '10%', title: '标志'},
134
                     {field: 'descript', width: '20%', title: '描述', minWidth: 80},
134
                     {field: 'descript', width: '20%', title: '描述', minWidth: 80},