fix some problem and data premission

Helius

2022-03-25 0b342b923cbec6ca293a98dd192b40c0fd2c12db

 src/main/resources/templates/febs/views/dapp/user.html

@@ -3,22 +3,22 @@
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                    <form class="layui-form layui-table-form" lay-filter="admin-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">用户名</label>
<!--                                        <label class="layui-form-label layui-form-label-sm">用户名</label>-->
                                        <div class="layui-input-inline">
                                            <input type="text" name="username" autocomplete="off" class="layui-input">
                                            <input type="text" name="username" autocomplete="off" placeholder="输入用户或者邀请码" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">创建时间</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="createTime" id="user-createTime" class="layui-input">
                                        </div>
                                    </div>
<!--                                    <div class="layui-inline">-->
<!--                                        <label class="layui-form-label layui-form-label-sm">创建时间</label>-->
<!--                                        <div class="layui-input-inline">-->
<!--                                            <input type="text" name="createTime" id="user-createTime" class="layui-input">-->
<!--                                        </div>-->
<!--                                    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">状态</label>
                                        <div class="layui-input-inline">
@@ -45,7 +45,7 @@
                            </div>
                        </div>
                    </form>
                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
                    <table lay-filter="adminTable" lay-data="{id: 'adminTable'}"></table>
                </div>
            </div>
        </div>
@@ -60,22 +60,10 @@
    }}
    <span class="layui-badge febs-bg-{{status.color}}">{{ status.title }}</span>
</script>
<script type="text/html" id="user-sex">
    {{#
    var sex = {
    2: {title: '保密'},
    1: {title: '女'},
    0: {title: '男'}
    }[d.sex];
    }}
    <span>{{ sex.title }}</span>
</script>
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="admin:view,admin:update,admin:delete">
        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
    </span>
    <a lay-event="edit" shiro:hasPermission="admin:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i></a>
    <a lay-event="del" shiro:hasPermission="admin:delete"><i class="layui-icon febs-edit-area febs-red">&#xe7f9;</i></a>
</script>
<script data-th-inline="none" type="text/javascript">
@@ -109,7 +97,7 @@
        dropdown.render({
            elem: $view.find('.action-more'),
            click: function (name, elem, event) {
                var checkStatus = table.checkStatus('userTable');
                var checkStatus = table.checkStatus('adminTable');
                if (name === 'add') {
                    febs.modal.open('新增用户', 'dappView/admin/add', {
                        btn: ['提交', '重置'],
@@ -166,7 +154,7 @@
            }]
        });

        table.on('tool(userTable)', function (obj) {
        table.on('tool(adminTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'del') {
@@ -189,7 +177,7 @@
            }
        });

        table.on('sort(userTable)', function (obj) {
        table.on('sort(adminTable)', function (obj) {
            sortObject = obj;
            tableIns.reload({
                initSort: obj,
@@ -207,26 +195,20 @@

        $reset.on('click', function () {
            $searchForm[0].reset();
            treeSelect.revokeNode('dept');
            sortObject.type = 'null';
            createTimeTo = null;
            createTimeFrom = null;
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'userTable',
                url: ctx + 'user/list',
                id: 'adminTable',
                url: ctx + 'dappUser/list',
                cols: [[
                    {type: 'checkbox'},
                    {field: 'username', title: '用户名', minWidth: 100},
                    {title: '性别', templet: '#user-sex'},
                    {field: 'deptName', title: '部门'},
                    {field: 'mobile', title: '手机', minWidth: 165},
                    {field: 'email', title: '邮箱', minWidth: 180},
                    {field: 'inviteId', title: '邀请码', minWidth: 100},
                    {title: '状态', templet: '#user-status'},
                    {field: 'lastLoginTime', title: '上次登录时间', minWidth: 100},
                    {field: 'createTime', title: '创建时间', minWidth: 180, sort: true},
                    {title: '操作', toolbar: '#user-option', minWidth: 140}
                ]]
@@ -234,19 +216,16 @@
        }

        function getQueryParams() {
            var createTime = $searchForm.find('input[name="createTime"]').val();
            if (createTime) {
                createTimeFrom = createTime.split(' - ')[0];
                createTimeTo = createTime.split(' - ')[1];
            }
            // var createTime = $searchForm.find('input[name="createTime"]').val();
            // if (createTime) {
            //     createTimeFrom = createTime.split(' - ')[0];
            //     createTimeTo = createTime.split(' - ')[1];
            // }
            return {
                createTimeFrom: createTimeFrom,
                createTimeTo: createTimeTo,
                // createTimeFrom: createTimeFrom,
                // createTimeTo: createTimeTo,
                username: $searchForm.find('input[name="username"]').val().trim(),
                status: $searchForm.find("select[name='status']").val(),
                sex: $searchForm.find("select[name='sex']").val(),
                mobile: $searchForm.find("input[name='mobile']").val().trim(),
                deptId: $searchForm.find("input[name='dept']").val().trim(),
                invalidate_ie_cache: new Date()
            };
        }
@@ -257,7 +236,7 @@
                febs.alert.warn('所选用户包含当前登录用户，无法删除');
                return;
            }
            febs.get(ctx + 'user/delete/' + userIds, null, function () {
            febs.post(ctx + 'dappUser/delete/' + userIds, null, function () {
                febs.alert.success('删除用户成功');
                $query.click();
            });