权限新增科所队级别 以及admin添加的用户角色结构其他用户使用时目录排列问题

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

@@ -456,7 +456,12 @@
   </select>
   <!--根据userid查询角色名-->
   <select id="selectSysRolesByUserId" parameterType="string" resultType="com.xzxtshiro.pojo.SysRole">
-          select ROLENAME,a.ROLE_ID as id from
+          select
+          ROLENAME,
+          a.ROLE_ID as id ,
+          b.ISPARENT as isparent,
+          b.PID as pid
+          from
           sys_user_role a,sys_role b
           where  A.USER_ID=#{userId,jdbcType=VARCHAR} and A.ROLE_ID=b.id
   </select>

src/main/resources/resource/db.properties

 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 
 jdbc.driver=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.100.105:1521:XZXT3
+jdbc.url=jdbc:oracle:thin:@47.92.129.99:1600:ORCL
 jdbc.username=XZXT
 jdbc.password=XZXT
 
@@ -9,13 +9,14 @@ shse.url=http://10.172.25.97:10096/framework/api/v1.0/rbac/user
 shse.appKey=SHAANXIPXZ
 shse.appSecret=bfawc1fe9b
 
-rest.host=http://127.0.0.1
-rest.port=9043
-
+rest.host=39.98.114.80
+rest.port=7779
+#索引
+redis.database=1
 #ip地址
-redis.hostName=127.0.0.1
+redis.hostName=39.98.114.80
 #端口号
-redis.port=6379
+redis.port=7779
 #如果有密码
 redis.password=
 #客户端超时时间单位是毫秒 默认是2000

src/main/resources/spring/applicationContext-jedis.xml

@@ -64,6 +64,8 @@
 	<!--redis连接工厂 -->
 	<bean id="jedisConnectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" destroy-method="destroy">
 		<property name="poolConfig" ref="jedisPoolConfig"></property>
+		<!--数据库索引 -->
+		<property name="database" value="${redis.database}"></property>
 		<!--IP地址 -->
 		<property name="hostName" value="${redis.hostName}"></property>
 		<!--端口号  -->

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

@@ -401,7 +401,9 @@
         dataType: "json",
         success: function (user) {
             //判断用户等级
-            if('X' == user.grade){
+            if('K' == user.grade){
+                $("#grade").append("科所队");
+            }else if('X' == user.grade){
                 $("#grade").append("县级");
             }else if('D' == user.grade){
                 $("#grade").append("地市级");

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

@@ -114,6 +114,7 @@
                     <div class="layui-input-block">
                         <select id="grade" name="grade" lay-verify="required" lay-filter="type">
                             <option value="">请选择</option>
+                            <option value="K">科所队</option>
                             <option value="X">县级</option>
                             <option value="D">地市级</option>
                             <option value="S">省级</option>

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

@@ -115,6 +115,7 @@
                     <div class="layui-input-block">
                         <select id="grade" name="grade" lay-verify="required" lay-filter="grade">
                             <option value="">请选择</option>
+                            <option value="K">科所队</option>
                             <option value="X">县级</option>
                             <option value="D">地市级</option>
                             <option value="S">省级</option>

xzxt-shiro.iml

@@ -12,7 +12,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">