3 Commitit 499c2758dd ... f1051e0d20

Tekijä SHA1 Viesti Päivämäärä
  lgl f1051e0d20 Merge branch 'master' into dev-lgl 5 kuukautta sitten
  ly e9317113e6 岗位管理 状态搜索bug 问题修复 5 kuukautta sitten
  ly f37d3a0fd9 角色管理 5 kuukautta sitten

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

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

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

@@ -25,10 +25,10 @@
25 25
             and sign like ('%'+#{sign}+'%')
26 26
         </if>
27 27
         <if test="name != null and name != ''">
28
-            and name like ('%'+#{name}+'%')
28
+            and r.NAME like ('%'+#{name}+'%')
29 29
         </if>
30 30
         <if test="status != null and status != ''">
31
-            and status = #{status}
31
+            and r.status = #{status}
32 32
         </if>
33 33
         <choose>
34 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 128
             cols: [
129 129
                 [
130 130
                     {type: "checkbox", fixed: 'left'},
131
-                    {type: 'numbers', fixed: 'left'},
131
+                    {type: 'numbers', fixed: 'left',title: '序号'},
132 132
                     {field: 'name', width: '10%', title: '名称'},
133 133
                     {field: 'sign', width: '10%', title: '标志'},
134 134
                     {field: 'descript', width: '20%', title: '描述', minWidth: 80},