解决下拉树、表格、以及部门删除的一些小bug

6 years ago · 494859a158
parent 4fe9dfa4a3
commit 494859a158
13 changed files with 103 additions and 13 deletions
--- a/src/main/java/com/yeqifu/sys/common/TreeNodeBuilder.java
+++ b/src/main/java/com/yeqifu/sys/common/TreeNodeBuilder.java
@ -11,11 +11,11 @@ public class TreeNodeBuilder {
    public static List<TreeNode> build(List<TreeNode> treeNodes, Integer topPid) {
        List<TreeNode> nodes = new ArrayList<TreeNode>();
        for (TreeNode n1 : treeNodes) {
-            if (n1.getPid().equals(topPid)){
+            if (n1.getPid()==topPid){
                nodes.add(n1);
            }
            for (TreeNode n2 : treeNodes) {
-                if (n1.getId().equals(n2.getPid())){
+                if (n1.getId()==n2.getPid()){
                    n1.getChildren().add(n2);
                }
            }
--- a/src/main/java/com/yeqifu/sys/mapper/PermissionMapper.java
+++ b/src/main/java/com/yeqifu/sys/mapper/PermissionMapper.java
@ -2,6 +2,9 @@ package com.yeqifu.sys.mapper;

 import com.yeqifu.sys.entity.Permission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;

 /**
 * <p>
@ -13,4 +16,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface PermissionMapper extends BaseMapper<Permission> {

+    /**
+     * 根据权限ID或菜单ID删除sys_role_permission表里面的数据
+     * @param id
+     */
+    void deleteRolePermissionByPid(@Param("id") Serializable id);
 }
--- a/src/main/java/com/yeqifu/sys/service/impl/DeptServiceImpl.java
+++ b/src/main/java/com/yeqifu/sys/service/impl/DeptServiceImpl.java
@ -6,6 +6,7 @@ import com.yeqifu.sys.mapper.DeptMapper;
 import com.yeqifu.sys.service.IDeptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 import java.io.Serializable;

@ -18,6 +19,7 @@ import java.io.Serializable;
 * @since 2019-11-26
 */
@Service
+@Transactional
 public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {

    @Override
--- a/src/main/java/com/yeqifu/sys/service/impl/LoginfoServiceImpl.java
+++ b/src/main/java/com/yeqifu/sys/service/impl/LoginfoServiceImpl.java
@ -5,6 +5,7 @@ import com.yeqifu.sys.mapper.LoginfoMapper;
 import com.yeqifu.sys.service.ILoginfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * <p>
@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 * @since 2019-11-23
 */
@Service
+@Transactional
 public class LoginfoServiceImpl extends ServiceImpl<LoginfoMapper, Loginfo> implements ILoginfoService {

 }
--- a/src/main/java/com/yeqifu/sys/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/yeqifu/sys/service/impl/NoticeServiceImpl.java
@ -5,6 +5,7 @@ import com.yeqifu.sys.mapper.NoticeMapper;
 import com.yeqifu.sys.service.INoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * <p>
@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 * @since 2019-11-25
 */
@Service
+@Transactional
 public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {

 }
--- a/src/main/java/com/yeqifu/sys/service/impl/PermissionServiceImpl.java
+++ b/src/main/java/com/yeqifu/sys/service/impl/PermissionServiceImpl.java
@ -5,6 +5,9 @@ import com.yeqifu.sys.mapper.PermissionMapper;
 import com.yeqifu.sys.service.IPermissionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;

 /**
 * <p>
@ -15,6 +18,16 @@ import org.springframework.stereotype.Service;
 * @since 2019-11-22
 */
@Service
+@Transactional
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements IPermissionService {

+    @Override
+    public boolean removeById(Serializable id) {
+
+        //根据权限ID或菜单ID删除sys_role_permission表中的数据
+        PermissionMapper permissionMapper = this.getBaseMapper();
+        permissionMapper.deleteRolePermissionByPid(id);
+        //删除权限表中的数据
+        return super.removeById(id);
+    }
 }
--- a/src/main/java/com/yeqifu/sys/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/yeqifu/sys/service/impl/UserServiceImpl.java
@ -5,6 +5,7 @@ import com.yeqifu.sys.mapper.UserMapper;
 import com.yeqifu.sys.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;

 /**
 * <p>
@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 * @since 2019-11-21
 */
@Service
+@Transactional
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {

 }
--- a/src/main/java/com/yeqifu/sys/mapper/xml/DeptMapper.xml
+++ b/src/main/java/com/yeqifu/sys/mapper/xml/DeptMapper.xml
--- a/src/main/java/com/yeqifu/sys/mapper/xml/LoginfoMapper.xml
+++ b/src/main/java/com/yeqifu/sys/mapper/xml/LoginfoMapper.xml
--- a/src/main/java/com/yeqifu/sys/mapper/xml/NoticeMapper.xml
+++ b/src/main/java/com/yeqifu/sys/mapper/xml/NoticeMapper.xml
--- a/src/main/java/com/yeqifu/sys/mapper/xml/PermissionMapper.xml
+++ b/src/main/java/com/yeqifu/sys/mapper/xml/PermissionMapper.xml
@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeqifu.sys.mapper.PermissionMapper">

+    <!--根据权限或菜单ID删除sys_role_permission表里面的数据-->
+    <delete id="deleteRolePermissionByPid">
+        delete from sys_role_permission where pid = ${id}
+    </delete>
+
 </mapper>
--- a/src/main/resources/templates/system/dept/deptRight.html
+++ b/src/main/resources/templates/system/dept/deptRight.html
@ -79,7 +79,7 @@
        <div class="layui-form-item">
            <label class="layui-form-label">父级部门</label>
            <div class="layui-input-block">
-                <input type="hidden" name="pid" id="pid">
+                <input type="hidden" name="pid" id="pid" lay-verify="required">
                <ul id="deptTree" class="dtree" data-id="0"></ul>
            </div>
        </div>
@ -133,7 +133,7 @@
        </div>
        <div class="layui-form-item">
            <div class="layui-input-block" style="text-align: center;padding-right: 7%">
-                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" id="doSubmit"><i
+                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doSubmit" id="doSubmit"><i
                        class="layui-icon layui-icon-search layui-icon-normal"></i>提交
                </button>
                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm"><i
@ -193,6 +193,15 @@
                        }
                    })
                }
+                //当是第一页时，如果当前返回的数据为0并且当前为第一页  给一个空的查询条件，并给curr赋初值为1
+                if (data.data.length==0 && curr==1){
+                    tableIns.reload({
+                        where: "",
+                        page:{
+                            curr:1
+                        }
+                    })
+                }
            }
        });

@ -242,11 +251,15 @@
                title:'添加部门',
                success:function () {
                    $("#dataFrm")[0].reset();
+                    //设置下拉树中父节点的值为空
+                    $("#pid").val("");
                    url="/dept/addDept";
                    //初始化排序码
                    $.get("/dept/loadDeptMaxOrderNum",function (res) {
                        $("#ordernum").val(res.value);
                    });
+                    //设置下拉树的value值为空
+                    selectTree.selectVal("");
                }
            });
        }
@ -271,7 +284,22 @@
            });
        }

-        $("#doSubmit").click(function () {
+        form.on("submit(doSubmit)",function (data) {
+            $.post(url,data.field,function (res) {
+                if (res.code==200){
+                    tableIns.reload();
+                    //重新加载添加弹出层的下拉树
+                    selectTree.reload();
+                    //重新加载左边的部门树
+                    window.parent.left.deptTree.reload();
+                }
+                layer.msg(res.msg);
+                layer.close(mainIndex);
+            });
+            return false;
+        });
+
+        /*$("#doSubmit").click(function () {
            var data = $("#dataFrm").serialize();
            $.post(url,data,function (res) {
                if (res.code==200){
@ -284,7 +312,7 @@
                layer.msg(res.msg);
                layer.close(mainIndex);
            });
-        });
+        });*/

        //删除
        function deleteDept(data) {
--- a/src/main/resources/templates/system/menu/menuRight.html
+++ b/src/main/resources/templates/system/menu/menuRight.html
@ -65,7 +65,7 @@
        <div class="layui-form-item">
            <label class="layui-form-label">父级菜单</label>
            <div class="layui-input-block">
-                <input type="hidden" name="pid" id="pid">
+                <input type="hidden" name="pid" id="pid" lay-verify="required">
                <ul id="menuTree" class="dtree" data-id="0"></ul>
            </div>
        </div>
@ -125,7 +125,7 @@
        </div>
        <div class="layui-form-item">
            <div class="layui-input-block" style="text-align: center;padding-right: 7%">
-                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" id="doSubmit"><i
+                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doSubmit" id="doSubmit"><i
                        class="layui-icon layui-icon-search layui-icon-normal"></i>提交
                </button>
                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm"><i
@ -161,11 +161,11 @@
            page: true,
            height: "full-130",
            cols: [ [
-                {field: 'id', title: 'ID', align: 'center',width:'50'},
+                {field: 'id', title: 'ID', align: 'center',width:'80'},
                {field: 'pid', title: '父级菜单ID', align: 'center',width:'100'},
                {field: 'title', title: '菜单名称', align: 'center',width:'150'},
                {field: 'href', title: '菜单地址', align: 'center',width:'200'},
-                {field: 'icon', title: '菜单图标', align: 'center',width:'100',templet:function (d) {
+                {field: 'icon', title: '菜单图标', align: 'center',width:'90',templet:function (d) {
                    return '<font class="layui-icon">'+d.icon+'</font>';
                }},
                {field: 'available', title: '是否可用', align: 'center',width:'100',templet:function (d) {
@ -174,7 +174,7 @@
                {field: 'open', title: '是否展开', align: 'center',width:'100',templet:function (d) {
                    return d.open==1?'<font color="blue">展开</font>':'<font color="red">不展开</font>';
                }},
-                {field: 'ordernum', title: '排序码', align: 'center',width:'100'},
+                {field: 'ordernum', title: '排序码', align: 'center',width:'80'},
                {field: 'target', title: 'TARGET', align: 'center',width:'80',hide:true},
                {fixed: 'right', title: '操作', toolbar: '#menuRowBar', align: 'center',width:'180'}
            ] ],
@ -187,6 +187,15 @@
                        }
                    })
                }
+                //当是第一页时，如果当前返回的数据为0并且当前为第一页  给一个空的查询条件，并给curr赋初值为1
+                if (data.data.length==0 && curr==1){
+                    tableIns.reload({
+                        where: "",
+                        page:{
+                            curr:1
+                        }
+                    })
+                }
            }
        });

@ -236,11 +245,15 @@
                title:'添加菜单',
                success:function () {
                    $("#dataFrm")[0].reset();
+                    //设置下拉树中父节点的值为空
+                    $("#pid").val("");
                    url="/menu/addMenu";
                    //初始化排序码
                    $.get("/menu/loadMenuMaxOrderNum",function (res) {
                        $("#ordernum").val(res.value);
                    });
+                    //设置下拉树的value值为空
+                    selectTree.selectVal("");
                }
            });
        }
@ -265,7 +278,22 @@
            });
        }

-        $("#doSubmit").click(function () {
+        form.on("submit(doSubmit)",function (data) {
+            $.post(url,data.field,function (res) {
+                if (res.code==200){
+                    tableIns.reload();
+                    //重新加载添加弹出层的下拉树
+                    selectTree.reload();
+                    //重新加载左边的菜单树
+                    window.parent.left.menuTree.reload();
+                }
+                layer.msg(res.msg);
+                layer.close(mainIndex);
+            });
+            return false;
+        });
+
+        /*$("#doSubmit").click(function () {
            var data = $("#dataFrm").serialize();
            $.post(url,data,function (res) {
                if (res.code==200){
@ -278,7 +306,7 @@
                layer.msg(res.msg);
                layer.close(mainIndex);
            });
-        });
+        });*/

        //删除
        function deleteMenu(data) {