扫黑项目用户权限相关内容修改

src/main/java/com/xzxtshiro/mapper/SysRoleMapper.xml

@@ -255,9 +255,9 @@
   </update>
 <!--批量添加角色权限-->
   <insert id="batchAddSysRolePermission" parameterType="java.util.List">
-    INSERT INTO sys_role_permission (ID, ROLEID,PERMISSIONID,LRR,LRSJ)
+    INSERT INTO sys_role_permission (ID, ROLEID,PERMISSIONID,LRR,LRSJ,XTLX)
     <foreach collection="list" item="sysRolePermission" index="index" separator="union all">
-        SELECT #{sysRolePermission.id},#{sysRolePermission.roleid}, #{sysRolePermission.permissionid}, #{sysRolePermission.lrr}, #{sysRolePermission.lrsj} FROM DUAL
+        SELECT #{sysRolePermission.id},#{sysRolePermission.roleid}, #{sysRolePermission.permissionid}, #{sysRolePermission.lrr}, #{sysRolePermission.lrsj},'SHCE' FROM DUAL
     </foreach>
   </insert>
   <!--根据用户id查询角色id-->
@@ -290,7 +290,8 @@ where ROLEID=#{id,jdbcType=VARCHAR})
         FROM
         sys_role_permission
         WHERE
-        ROLEID =#{roleId}
+        XTLX = 'SHCE'
+        and ROLEID =#{roleId}
     </delete>
     <!--<update id="deleteSysRoleById">
         update SYS_ROLE

src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml

@@ -643,6 +643,7 @@
         sys_user_role
         WHERE
         USER_ID =#{userId,jdbcType=VARCHAR}
+        and XTLX = 'SHCE'
   </delete>
   <!--插入用户照片-->
   <insert id="insertUserZp" parameterType = "com.xzxtshiro.pojo.SysUserZp">
@@ -682,7 +683,9 @@
     left join
     (select u.user_id ,
     xmlagg(xmlparse(content roleName||',' wellformed) order by u.user_id).getclobval() as roleName
-    from sys_role r join  sys_user_role u on r.id=u.role_id where   u.scbz='0' and r.scbz='0' GROUP BY  u.user_id) tt
+    from sys_role r join  sys_user_role u on r.id=u.role_id
+    where   u.scbz='0' and r.scbz='0' and r.xtlx='SHCE' and u.xtlx='SHCE'
+    GROUP BY  u.user_id) tt
     on t.id=tt.user_id
     where scbz='0'
     <if test="userId !=null"> and ID = #{userId} </if>

src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java

@@ -312,7 +312,7 @@ public class SysUserServiceImpl implements SysUserService {
             deleteUserZpByUserId(user.getId());
             addUserZp(user);
         }
-        authorize(user, false,dlUser, userDao);
+        authorize(user, true,dlUser, userDao);
         return user;
     }
 

src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp

@@ -117,7 +117,7 @@
                            </div>
                        </div>
                    </div>
-                   <div class="oneNode">
+                   <%--<div class="oneNode">
                        <!--左侧小球-->
                        <div class="check check-success">
                            三员角色
@@ -129,23 +129,23 @@
                        <!--右侧内容-->
                        <div class="NodeDetail">
                            <!--上-->
-                           <%--<div class="NodeDetail-title">--%>
-                               <%--<!--内容-->--%>
-                               <%--&lt;%&ndash;<div class="details">--%>
-                                   <%--<h4>${user.username}</h4>--%>
-                               <%--</div>&ndash;%&gt;--%>
-                           <%--</div>--%>
-                           <%--<!--中-->--%>
+                           &lt;%&ndash;<div class="NodeDetail-title">&ndash;%&gt;
+                               &lt;%&ndash;<!--内容-->&ndash;%&gt;
+                               &lt;%&ndash;&lt;%&ndash;<div class="details">&ndash;%&gt;
+                                   &lt;%&ndash;<h4>${user.username}</h4>&ndash;%&gt;
+                               &lt;%&ndash;</div>&ndash;%&gt;&ndash;%&gt;
+                           &lt;%&ndash;</div>&ndash;%&gt;
+                           &lt;%&ndash;<!--中-->&ndash;%&gt;
                            <div class="NodeDetail-content" id = "gzzmplay">
-                               <%--<span class="badge">侦查员</span>--%>
-                               <%--<span class="badge">指挥员</span>--%>
-                               <%--<span class="badge">研判员</span>--%>
-                               <%--<span class="badge">刑事技术负责人</span>--%>
-                               <%--<span class="badge">电诈预警员</span>--%>
-                               <%--<span class="badge">刑事技术员</span>--%>
-                           </div>
+                               &lt;%&ndash;<span class="badge">侦查员</span>&ndash;%&gt;
+                               &lt;%&ndash;<span class="badge">指挥员</span>&ndash;%&gt;
+                               &lt;%&ndash;<span class="badge">研判员</span>&ndash;%&gt;
+                               &lt;%&ndash;<span class="badge">刑事技术负责人</span>&ndash;%&gt;
+                               &lt;%&ndash;<span class="badge">电诈预警员</span>&ndash;%&gt;
+                               &lt;%&ndash;<span class="badge">刑事技术员</span>&ndash;%&gt;
                            </div>
                        </div>
+                   </div>--%>
                    <div class="oneNode">
                        <!--左侧小球-->
                        <div class="check check-warning">

src/main/webapp/WEB-INF/jsp/admin/user/add.jsp

@@ -116,7 +116,7 @@
                             <option value="X">县级</option>
                             <option value="D">地市级</option>
                             <option value="S">省级</option>
-                            <option value="T">特级</option>
+                            <%--<option value="T">特级</option>--%>
                         </select>
                     </div>
                 </div>

src/main/webapp/WEB-INF/jsp/admin/user/update.jsp

@@ -113,7 +113,7 @@
                             <option value="X">县级</option>
                             <option value="D">地市级</option>
                             <option value="S">省级</option>
-                            <option value="T">特级</option>
+                            <%--<option value="T">特级</option>--%>
                         </select>
                     </div>
                 </div>