将用户、角色和权限删除改为真实删除；修改根据单位查询的逻辑；修改更新权限功能的bug

src/main/java/com/xzxtshiro/controller/admin/SysUserController.java

@@ -73,12 +73,48 @@ public class SysUserController {
     @ResponseBody
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public BaseModel list(SysUser user) {
-        System.out.println("openflag================="+user.getOpenFlag());
-        System.out.println("unitcode================="+user.getUnitcode());
+        if(user!=null&&user.getUnitcode()!=null){
+            user.setUnitcode(getDwLike(user.getUnitcode(),0));
+        }
         user = setQueryParam(user);
         return userService.selectSysUserPage(user);
     }
 
+    /**
+     * 函数功能：给单位代码右截0
+     * @param code：待处理字符串
+     * @param type: 0 sql 1 solr
+     * @return：参数值
+     */
+    static final public String getDwLike(String code, int type) {
+
+        if(code.equals("150000S10000")){//内蒙森林公安局特殊情况
+            if(type == 0){
+                code = "(150000S|150723S|150728S|150782S|150784S|150785S|152202S)";
+            }else{
+                code = "(150000S* OR 150723S* OR 150728S* OR 150782S* OR 150784S* OR 150785S* OR 152202S*)";
+            }
+
+            return code;
+        }
+
+        if (code.endsWith("0000000000")) {//省
+            code = code.substring(0, 2);
+        }else if  (code.endsWith("00000000")) {//市
+            code = code.substring(0, 4);
+        }else if (code.endsWith("000000")) {//县
+            code = code.substring(0, 6);
+        }else if (code.endsWith("0000")) {//科所队
+            code = code.substring(0, 8);
+        }else if (code.endsWith("00")) {//科所中队
+            code = code.substring(0, 10);
+        } else {
+            code = code;
+        }
+
+        return code;
+    }
+
     public static SysUser setQueryParam(SysUser user) {
         //获取当前登录用户
         SysUser dlUser = TokenUtil.getUser();

src/main/java/com/xzxtshiro/dao/SysRoleDao.java

@@ -84,6 +84,7 @@ public interface SysRoleDao {
      */
     int deleteSysRoleById(@Param("id") String id);
 
+
     /**
      * 根据用户id获取角色id
      * @param userId

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

@@ -240,11 +240,15 @@
       STATUS = #{permission.status,jdbcType=VARCHAR}
       WHERE id = #{permission.id}
   </update>
-  <update id="deletePermissionById">
+<!--  <update id="deletePermissionById">
     update SYS_PERMISSION_NEW
     set SCBZ = 1
     WHERE id = #{permission.id,jdbcType=VARCHAR}
-  </update>
+  </update>-->
+
+  <delete id="deletePermissionById">
+    DELETE from SYS_PERMISSION_NEW where id = #{permission.id,jdbcType=VARCHAR}
+  </delete>
 
 
   <!--根据权限 id 查询角色信息-->

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

@@ -241,12 +241,12 @@
         WHERE
         ROLEID =#{roleId}
     </delete>
-    <update id="deleteSysRoleById">
+    <!--<update id="deleteSysRoleById">
         update SYS_ROLE
         set
         SCBZ = 1
         where ID = #{id,jdbcType=VARCHAR}
-    </update>
+    </update>-->
   <!--根据用户id查询用户所拥有的权限-->
   <select id="querySysRoleByUserId" resultType="com.xzxtshiro.pojo.SysRole" parameterType="java.lang.String">
       SELECT   <include refid="Base_Column_List" />
@@ -255,4 +255,8 @@
                   FROM   sys_user_role
                  WHERE   user_id = #{userId,jdbcType=VARCHAR})
   </select>
+
+  <delete id="deleteSysRoleById">
+    DELETE from sys_role where ID = #{id,jdbcType=VARCHAR}
+  </delete>
 </mapper>
\ No newline at end of file

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

@@ -68,7 +68,7 @@
                 <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label">菜单名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="menuname" lay-verify="required" placeholder="请输入权限代码"
+                        <input type="text" name="menuname" placeholder="请输入权限代码"
                                value="${oldPermission.menuname}" class="layui-input">
                     </div>
                 </div>
@@ -76,7 +76,7 @@
                 <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label">权限代码</label>
                     <div class="layui-input-block">
-                        <input type="text" name="permission" lay-verify="required" placeholder="请输入权限代码"
+                        <input type="text" name="permission" placeholder="请输入权限代码"
                                value="${oldPermission.permission}" class="layui-input">
                     </div>
                 </div>