From 58f8115485549d037685d309107e211dde24eba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=A3=8E?= <2452618307@qq.com> Date: Thu, 25 Apr 2024 13:53:46 +0800 Subject: [PATCH] .. --- .../controller/AnnouncementController.java | 6 + .../manager/controller/RoleController.java | 76 ++++- .../manager/controller/UserController.java | 19 +- .../manager/manager/dao/AnnouncementDao.java | 6 + .../manager/manager/dao/RoleDao.java | 32 ++- .../manager/manager/entity/TreeBean.java | 3 + .../manager/manager/model/RoleBean.java | 4 + .../manager/service/AnnouncementService.java | 7 + .../manager/manager/service/RoleService.java | 31 ++ .../service/impl/AnnouncementServiceImpl.java | 9 + .../manager/service/impl/RoleServiceImpl.java | 56 +++- .../manager/service/impl/UserServiceImpl.java | 5 +- .../announcement/AnnouncementMapper.xml | 27 +- .../resources/mappers/role/RoleMapper.xml | 65 ++++- .../resources/mappers/user/newUserMapper.xml | 6 +- .../static/js/work/user/UserManagementList.js | 43 ++- .../static/js/work/user/leaderSetList.js | 11 +- .../organizational/organizationalList.html | 14 +- .../static/pages/role/addNewRole.html | 261 ++++++++++++----- .../resources/static/pages/role/addUser.html | 265 +++++++++++------- .../static/pages/role/newRoleList.html | 26 +- .../static/pages/role/updateRole.html | 125 +++++++++ .../static/pages/user/leaderSetList.html | 7 +- .../static/pages/user/selectLeader.html | 55 ++-- .../resources/static/pages/user/userList.html | 11 +- 25 files changed, 895 insertions(+), 275 deletions(-) create mode 100644 src/main/resources/static/pages/role/updateRole.html diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/controller/AnnouncementController.java b/src/main/java/com/bonus/leader/performance/manager/manager/controller/AnnouncementController.java index c002d6e..53e9367 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/controller/AnnouncementController.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/controller/AnnouncementController.java @@ -199,6 +199,12 @@ public class AnnouncementController { return service.getCompanyProTree(o); } @LogAnnotation + @PostMapping("getPersonTree") + @ApiOperation(value = "公司-项目部-人员树") + public List getPersonTree(TreeBean o) { + return service.getPersonTree(o); + } + @LogAnnotation @PostMapping("personTree") @ApiOperation(value = "系统公告-公司-回显人员树") public List personTree(TreeBean o) { diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/controller/RoleController.java b/src/main/java/com/bonus/leader/performance/manager/manager/controller/RoleController.java index c6dd48a..ba55706 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/controller/RoleController.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/controller/RoleController.java @@ -7,6 +7,7 @@ import java.util.Map; import com.bonus.leader.performance.manager.manager.config.ConstantConfig; import com.bonus.leader.performance.manager.manager.dao.RoleDao; import com.bonus.leader.performance.manager.manager.entity.RoleDto; +import com.bonus.leader.performance.manager.manager.entity.TreeBean; import com.bonus.leader.performance.manager.manager.model.Role; import com.bonus.leader.performance.manager.manager.model.RoleBean; import com.bonus.leader.performance.manager.manager.table.PageTableHandler; @@ -16,6 +17,7 @@ import com.bonus.leader.performance.manager.manager.service.RoleService; import com.bonus.leader.performance.manager.manager.utils.AjaxRes; import com.bonus.leader.performance.manager.manager.utils.GlobalConst; import com.bonus.leader.performance.manager.manager.utils.R; +import com.bonus.leader.performance.manager.manager.utils.StringHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -27,6 +29,8 @@ import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import javax.xml.rpc.holders.StringHolder; + /** * 角色相关接口 * @@ -108,9 +112,10 @@ public class RoleController { @ApiOperation(value = "角色管理-列表查询") public R getNewRoleList(RoleBean o) { List list = roleService.getNewRoleList(o); - return list.size() > 0 ? R.okTable(list, list.size()) : R.failTable("暂无数据"); + return !list.isEmpty() ? R.okTable(list, list.size()) : R.failTable("暂无数据"); } + @RequestMapping(value = "addNewRoleData", method = RequestMethod.POST) @ResponseBody @ApiOperation(value = "角色-新增") @@ -223,4 +228,73 @@ public class RoleController { } return ar; } + @RequestMapping(value = "updateRolePersonData", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "角色-修改成员角色") + @Transactional + public AjaxRes updateRolePersonData(@RequestBody RoleBean bean) throws Exception { + AjaxRes ar = new AjaxRes(); + int cb = roleService.updateRolePersonData(bean); + ar.setFailMsg(GlobalConst.DATA_FAIL); + if (cb > 0) { + ar.setFailMsg(GlobalConst.INIT_SUCCEED); + } + return ar; + } + + /** + * 获取组织人员树 + */ + @LogAnnotation + @PostMapping("getTree") + @ApiOperation(value = "组织-人员树") + public List getTree(TreeBean o) { + return roleService.getTree(o); + } + + /** + * 获取人员列表 + */ + @LogAnnotation + @PostMapping("getPersonList") + @ApiOperation(value = "角色管理-人员列表查询") + public R getPersonList(RoleBean o) { + List list = roleService.getPersonList(o); + return !list.isEmpty() ? R.okTable(list, list.size()) : R.failTable("暂无数据"); + } + /** + * 获取已经设置当前角色的人员id + */ + @RequestMapping(value = "getInitPersonId", method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "角色-获取已经设置当前角色的人员id") + @Transactional + public AjaxRes getInitPersonId(TreeBean bean){ + AjaxRes ar = new AjaxRes(); + String result = roleService.getInitPersonId(bean); + ar.setFailMsg(GlobalConst.DATA_FAIL); + if (StringHelper.isNotEmpty(result)) { + Map map = new HashMap<>(100); + map.put("result", result); + ar.setSucceed(map, GlobalConst.INIT_SUCCEED); + } + return ar; + } + + /** + * 根据ID删除角色下的人员 + */ + @LogAnnotation + @PostMapping("delPersonById") + @ApiOperation(value = "角色-根据ID删除角色下的人员") + public AjaxRes delPersonById(RoleBean bean) { + AjaxRes ar = new AjaxRes(); + int result = roleService.delPersonById(bean); + if (result > 0) { + ar.setSucceedMsg(GlobalConst.DATA_SUCCEED); + } else { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/controller/UserController.java b/src/main/java/com/bonus/leader/performance/manager/manager/controller/UserController.java index 80b3029..4e26b4d 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/controller/UserController.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/controller/UserController.java @@ -224,7 +224,7 @@ public class UserController { return ar; } - @RequestMapping(value = "getListPerson", method = RequestMethod.POST) + @PostMapping("getListPerson") @ResponseBody @ApiOperation(value = "个人信息-查询") public AjaxRes getListPerson(){ @@ -238,10 +238,10 @@ public class UserController { return ar; } - @RequestMapping(value = "updateMyInfo", method = RequestMethod.POST) + @PostMapping( "updateMyInfo") @ResponseBody @ApiOperation(value = "个人信息-修改") - public AjaxRes updateMyInfo(@RequestBody SysUser bean) throws Exception { + public AjaxRes updateMyInfo(@RequestBody SysUser bean){ AjaxRes ar = new AjaxRes(); int cb = userService.updateMyInfo(bean); ar.setFailMsg(GlobalConst.DATA_FAIL); @@ -251,7 +251,7 @@ public class UserController { return ar; } - @RequestMapping(value = "getListById", method = RequestMethod.POST) + @PostMapping("getListById") @ResponseBody @ApiOperation(value = "用户管理-查询人员信息") public AjaxRes getListById(String id){ @@ -270,11 +270,8 @@ public class UserController { @LogAnnotation @PostMapping("delById") @ApiOperation(value = "用户管理-删除") - public AjaxRes delById(SysUser bean) throws Exception { + public AjaxRes delById(SysUser bean) { AjaxRes ar = new AjaxRes(); - //删除之前先查询出来 - Long userId = bean.getId(); - SysUser userDto = userDao.getEyId(userId); int result = userService.delById(bean); if(result==1){ ar.setSucceedMsg(GlobalConst.DATA_SUCCEED); @@ -314,17 +311,17 @@ public class UserController { @LogAnnotation @PostMapping("delLeaderById") @ApiOperation(value = "公司领导设置-删除") - public AjaxRes delLeaderById(LeaderBean bean) throws Exception { + public AjaxRes delLeaderById(LeaderBean bean) { AjaxRes ar = new AjaxRes(); userService.delLeaderById(bean); ar.setSucceedMsg(GlobalConst.DATA_SUCCEED); return ar; } - @RequestMapping(value = "insertLeaderData", method = RequestMethod.POST) + @PostMapping("insertLeaderData") @ResponseBody @ApiOperation(value = "用户管理-选择领导") - public AjaxRes insertLeaderData(@RequestBody SysUser bean) throws Exception { + public AjaxRes insertLeaderData(@RequestBody SysUser bean){ AjaxRes ar = new AjaxRes(); int cb = userService.insertLeaderData(bean); ar.setFailMsg(GlobalConst.DATA_FAIL); diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/dao/AnnouncementDao.java b/src/main/java/com/bonus/leader/performance/manager/manager/dao/AnnouncementDao.java index 3923d68..ff4e12f 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/dao/AnnouncementDao.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/dao/AnnouncementDao.java @@ -174,5 +174,11 @@ public interface AnnouncementDao { * @return */ AskLeaveBean getAccrossStartData(AskLeaveBean o); + /** + * 获取人员树 + * @param o TreeBean + * @return List + */ + List getPersonTreeForLeader(TreeBean o); } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/dao/RoleDao.java b/src/main/java/com/bonus/leader/performance/manager/manager/dao/RoleDao.java index 2b30e82..e27afa5 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/dao/RoleDao.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/dao/RoleDao.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.bonus.leader.performance.manager.manager.entity.RoleDto; +import com.bonus.leader.performance.manager.manager.entity.TreeBean; import com.bonus.leader.performance.manager.manager.model.Role; import com.bonus.leader.performance.manager.manager.model.RoleBean; import org.apache.ibatis.annotations.Delete; @@ -162,9 +163,34 @@ public interface RoleDao { int insertRolePersonData(String roleId, String id); /** - * 删除数据 - * @param roleId - * @param id + * 根据id删除数据 + * @param roleId 角色id + * @param id 人员id */ void deleteRoleUserId(String roleId, String id); + /** + * 获取组织人员数 + * @param o TreeBean + * @return List + */ + List getTree(TreeBean o); + /** + * 获取成员列表数据 + * @param o RoleBean + * @return List + */ + List getPersonList(RoleBean o); + /** + * 获取已经设置当前角色的人员id + * @param bean TreeBean + * @return String + */ + String getInitPersonId(TreeBean bean); + + /** + * 根据ID删除角色下的人员 + * @param roleId 角色id + * @param userId 人员id + */ + void updateSysUser(String roleId, String userId); } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/entity/TreeBean.java b/src/main/java/com/bonus/leader/performance/manager/manager/entity/TreeBean.java index 5d639ef..5142a45 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/entity/TreeBean.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/entity/TreeBean.java @@ -13,6 +13,8 @@ import lombok.Data; public class TreeBean { private String id; private String title; + private String value; + private String name; private String parentId; private String level; private String subId; @@ -21,4 +23,5 @@ public class TreeBean { private String personType; private String type; private String parentName; + private String roleId; } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/model/RoleBean.java b/src/main/java/com/bonus/leader/performance/manager/manager/model/RoleBean.java index 37860ea..9386704 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/model/RoleBean.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/model/RoleBean.java @@ -15,10 +15,14 @@ public class RoleBean { private String roleId; private String userId; private String name; + private String postName; private String description; private String createTime; private String updateTime; private String status; private String membersNum; private String dataPermissions; + private String keyWord; + private String roleLevel; + private String personNum; } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/service/AnnouncementService.java b/src/main/java/com/bonus/leader/performance/manager/manager/service/AnnouncementService.java index 61340f2..cf5b91d 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/service/AnnouncementService.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/service/AnnouncementService.java @@ -116,4 +116,11 @@ public interface AnnouncementService { * @return */ List getAskLeaveList(AskLeaveBean o); + + /** + * 获取人员树 + * @param o TreeBean + * @return List + */ + List getPersonTree(TreeBean o); } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/service/RoleService.java b/src/main/java/com/bonus/leader/performance/manager/manager/service/RoleService.java index 6bcc4c0..648ea92 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/service/RoleService.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/service/RoleService.java @@ -1,6 +1,7 @@ package com.bonus.leader.performance.manager.manager.service; import com.bonus.leader.performance.manager.manager.entity.RoleDto; +import com.bonus.leader.performance.manager.manager.entity.TreeBean; import com.bonus.leader.performance.manager.manager.model.RoleBean; import java.util.List; @@ -26,4 +27,34 @@ public interface RoleService { int updateRoleLevel(RoleDto bean); int insertRolePersonData(RoleBean bean); + + /** + * 获取组织人员树 + * @param o TreeBean + * @return List + */ + List getTree(TreeBean o); + + /** + * 获取成员列表数据 + * @param o RoleBean + * @return List + */ + List getPersonList(RoleBean o); + + /** + * 获取已经设置当前角色的人员id + * @param bean TreeBean + * @return String + */ + String getInitPersonId(TreeBean bean); + + /** + * 根据ID删除角色下的人员 + * @param bean RoleBean + * @return int + */ + int delPersonById(RoleBean bean); + + int updateRolePersonData(RoleBean bean); } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/AnnouncementServiceImpl.java b/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/AnnouncementServiceImpl.java index 77ba322..7f66b86 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/AnnouncementServiceImpl.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/AnnouncementServiceImpl.java @@ -173,4 +173,13 @@ public class AnnouncementServiceImpl implements AnnouncementService { return list; } + /** + * 获取人员树 + * @param o TreeBean + * @return List + */ + @Override + public List getPersonTree(TreeBean o) { + return dao.getPersonTreeForLeader(o); + } } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/RoleServiceImpl.java b/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/RoleServiceImpl.java index 694ede5..6cc85bc 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/RoleServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.leader.performance.manager.manager.service.impl; import java.util.List; import com.bonus.leader.performance.manager.manager.dao.RoleDao; +import com.bonus.leader.performance.manager.manager.entity.TreeBean; import com.bonus.leader.performance.manager.manager.model.Role; import com.bonus.leader.performance.manager.manager.model.RoleBean; import org.slf4j.Logger; @@ -137,14 +138,63 @@ public class RoleServiceImpl implements RoleService { String[] userIdArr = userId.split(","); int code = 0; for (String id : userIdArr) { + id = id.replace("p",""); int num = roleDao.getIsExistRelation(bean.getRoleId(), id); if (num > 0){ roleDao.deleteRoleUserId(bean.getRoleId(), id); - code = roleDao.insertRolePersonData(bean.getRoleId(), id); - }else { - code = roleDao.insertRolePersonData(bean.getRoleId(), id); } + roleDao.updateSysUser(bean.getRoleId(), id); + code = roleDao.insertRolePersonData(bean.getRoleId(), id); } return code; } + /** + * 获取组织人员数 + * @param o TreeBean + * @return List + */ + @Override + public List getTree(TreeBean o) { + return roleDao.getTree(o); + } + /** + * 获取成员列表数据 + * @param o RoleBean + * @return List + */ + @Override + public List getPersonList(RoleBean o) { + return roleDao.getPersonList(o); + } + /** + * 获取已经设置当前角色的人员id + * @param bean TreeBean + * @return String + */ + @Override + public String getInitPersonId(TreeBean bean) { + return roleDao.getInitPersonId(bean); + } + + /** + * 根据ID删除角色下的人员 + * @param bean RoleBean + * @return int + */ + @Override + public int delPersonById(RoleBean bean) { + String userId = bean.getUserId(); + String[] userIdArr = userId.split(","); + for (String id : userIdArr) { + roleDao.deleteRoleUserId(bean.getRoleId(), id); + } + return 1; + } + + @Override + public int updateRolePersonData(RoleBean bean) { + roleDao.deleteRoleUserId(bean.getId(), bean.getUserId()); + roleDao.updateSysUser(bean.getId(), bean.getUserId()); + return roleDao.insertRolePersonData(bean.getRoleId(), bean.getUserId()); + } } diff --git a/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/UserServiceImpl.java index 3dd5caa..78039f4 100644 --- a/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/leader/performance/manager/manager/service/impl/UserServiceImpl.java @@ -167,6 +167,7 @@ public class UserServiceImpl implements UserService { @Override public int delById(SysUser bean) { + userDao.deleteUserRole(bean.getId()); return userDao.delById(bean); } @@ -177,7 +178,7 @@ public class UserServiceImpl implements UserService { @Override public int setSort(LeaderBean bean) { - int code = 0; + int code; if(Integer.parseInt(bean.getOldSort()) > Integer.parseInt(bean.getSort())) { code = userDao.setOtherSort(bean); }else { @@ -207,7 +208,7 @@ public class UserServiceImpl implements UserService { int code = 0; for (String id : userArr) { sort++; - bean.setUserId(id); + bean.setUserId(id.replace("p","")); bean.setSort(String.valueOf(sort)); code = userDao.insertLeaderData(bean); } diff --git a/src/main/resources/mappers/announcement/AnnouncementMapper.xml b/src/main/resources/mappers/announcement/AnnouncementMapper.xml index 244d38a..1a353b3 100644 --- a/src/main/resources/mappers/announcement/AnnouncementMapper.xml +++ b/src/main/resources/mappers/announcement/AnnouncementMapper.xml @@ -20,8 +20,8 @@ values (#{fileName}, #{filePath}, #{userId}, #{userName}) - insert into sys_organization(org_name, parent_id, level, is_active, is_enable) - values (#{title}, #{parentId}, #{level}, '1', '1') + insert into sys_organization(org_name,parent_id,level,is_active,is_enable,org_type,leader_type) + values(#{title},#{parentId},#{level},'1','1',#{type},#{personType}) update sys_data_dict @@ -323,5 +323,28 @@ order by al.id asc limit 1 + \ No newline at end of file diff --git a/src/main/resources/mappers/role/RoleMapper.xml b/src/main/resources/mappers/role/RoleMapper.xml index a0b67dc..7a266af 100644 --- a/src/main/resources/mappers/role/RoleMapper.xml +++ b/src/main/resources/mappers/role/RoleMapper.xml @@ -16,11 +16,14 @@ update sys_role_user set userId = #{id} where roleId = #{roleId} + + update sys_user set role_id = #{roleId} where id = #{userId} + update sys_role set is_active = '0' where id = #{id} - delete from sys_role_user where roleId = #{roleId} and userId = #{id} + delete from sys_role_user where userId = #{id} + + + - + insert into sys_role_permission(roleId, permissionId) values diff --git a/src/main/resources/mappers/user/newUserMapper.xml b/src/main/resources/mappers/user/newUserMapper.xml index 098e4cc..26e98fe 100644 --- a/src/main/resources/mappers/user/newUserMapper.xml +++ b/src/main/resources/mappers/user/newUserMapper.xml @@ -88,8 +88,8 @@ and t.role_id = #{roleId} - - and t.org_id = #{orgId} + + and t.org_id = #{departmentId} diff --git a/src/main/resources/static/js/work/user/UserManagementList.js b/src/main/resources/static/js/work/user/UserManagementList.js index 4ca2e5b..11a3987 100644 --- a/src/main/resources/static/js/work/user/UserManagementList.js +++ b/src/main/resources/static/js/work/user/UserManagementList.js @@ -1,12 +1,13 @@ -var oldKeyWord; -var oldDepartment; -var oldDepartmentId; -var oldRoleId; -var oldRoleName; +let oldKeyWord; +let oldDepartment; +let oldDepartmentId; +let oldRoleId; +let laydate; +let oldRoleName; layui.use(['table', 'layer', 'laydate', 'jquery', 'form','notice','layNotify'], function () { - var table = layui.table; - var laydate = layui.laydate; - let form = layui.form; + table = layui.table; + laydate = layui.laydate; + form = layui.form; notice = layui.notice; layNotify = layui.layNotify; @@ -183,10 +184,10 @@ function openForm(id,title){ * 删除功能 */ function del(id) { - layer.confirm('确定要删除吗？', { + var index = layer.confirm('确定要删除吗？', { btn : [ '确定', '取消' ] }, function() { - ajaxCommonMethods('/users/delById',{'id': id},"删除成功","删除失败","1"); + ajaxCommonMethods('/users/delById',{'id': id},"删除成功","删除失败","1",index); layer.close(1); }); } @@ -197,7 +198,7 @@ function del(id) { * @param id */ function resetPassword(id){ - layer.prompt({ + var index = layer.prompt({ formType: 0, value: '', title: '请输入重置后密码', @@ -208,7 +209,7 @@ function resetPassword(id){ thisTip('提示','密码过于简单,必须包含数字，特殊符号，大写或小写！','warning') return false; } - ajaxCommonMethods('/users/resetPassword',{'id': id,'password':value},"重置成功","重置失败","1"); + ajaxCommonMethods('/users/resetPassword',{'id': id,'password':value},"重置成功","重置失败","1",index); }); } @@ -302,7 +303,7 @@ function clickRole(e, treeId, treeNode) { * @param error * @param type 1 父页面 2 子页面 */ -function ajaxCommonMethods(url, data, success, error, type) { +function ajaxCommonMethods(url, data, success, error, type,index) { $.ajax({ type: 'POST', async: false, // 默认异步true,false表示同步 @@ -311,9 +312,25 @@ function ajaxCommonMethods(url, data, success, error, type) { dataType: 'json', // 服务器返回数据类型 data: data, //获取提交的表单字段 success: function (data) { + layer.close(index) var resMsg = data.resMsg; if ("数据获取成功" == resMsg) { thisTip('提示', success, 'success'); + setTimeout(function (){ + table.reload('menuTable', { + url: ctxPath + '/users/getUserList' + , method: 'post' //方式默认是get + , page: true + , where: { + username: "", + keyWord: "", + department: "", + departmentId: "", + roleId: "" + } //设定异步数据接口的额外参数 + }); + + }) } else { thisTip('提示', error, 'error'); } diff --git a/src/main/resources/static/js/work/user/leaderSetList.js b/src/main/resources/static/js/work/user/leaderSetList.js index 36a07f8..9c3e585 100644 --- a/src/main/resources/static/js/work/user/leaderSetList.js +++ b/src/main/resources/static/js/work/user/leaderSetList.js @@ -56,7 +56,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form','notice', 'layNotify'], var id = data.id if (layEvent === 'sort') { //排序 - layer.prompt({ + var index = layer.prompt({ formType: 0, value: '', title: '请输入排序序号', @@ -67,7 +67,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form','notice', 'layNotify'], parentTip('提示',"序号必须是正整数！", "error"); return false; } - ajaxCommonMethods('/users/setSort',{'id': id,'sort':value,'oldSort':data.sort},"设置成功","设置失败","1"); + ajaxCommonMethods('/users/setSort',{'id': id,'sort':value,'oldSort':data.sort},"设置成功","设置失败","1",index); }); } else if (layEvent === 'del') { del(id,data.sort); @@ -128,16 +128,16 @@ function openForm(id, title) { * 删除功能 */ function del(id,sort) { - layer.confirm('确定要删除吗？', { + var index = layer.confirm('确定要删除吗？', { btn: ['确定', '取消'] }, function () { - ajaxCommonMethods('/users/delLeaderById', {'id': id,'sort':sort}, "删除成功", "删除失败", "1"); + ajaxCommonMethods('/users/delLeaderById', {'id': id,'sort':sort}, "删除成功", "删除失败", "1",index); layer.close(1); }); } -function ajaxCommonMethods(url, data, success, error, type) { +function ajaxCommonMethods(url, data, success, error, type,index) { $.ajax({ type: 'POST', async: false, // 默认异步true,false表示同步 @@ -146,6 +146,7 @@ function ajaxCommonMethods(url, data, success, error, type) { dataType: 'json', // 服务器返回数据类型 data: data, //获取提交的表单字段 success: function (data) { + layer.close(index); var resMsg = data.resMsg; if ("数据获取成功" == resMsg) { parentTip('提示', success, "success"); diff --git a/src/main/resources/static/pages/organizational/organizationalList.html b/src/main/resources/static/pages/organizational/organizationalList.html index 9788742..57a15c5 100644 --- a/src/main/resources/static/pages/organizational/organizationalList.html +++ b/src/main/resources/static/pages/organizational/organizationalList.html @@ -23,6 +23,10 @@ padding: 0px 10px; font-size: 16px; } + #dataTree2{ + max-width: 350px; + width: auto !important; + }
@@ -71,7 +75,7 @@ type: 'post', url: ctxPath + '/announcement/tree',//数据接口 dataType: 'json', // 服务器返回数据类型 - async: true, + async: false, data: {}, success: function (data) { var result = []; @@ -122,9 +126,7 @@ content: "./organizationalForm.html", area: ['60%', '45%'], maxmin: false, - end: function () { - initData(); - } + }); } }, @@ -141,9 +143,7 @@ content: "./organizationalForm.html", area: ['60%', '45%'], maxmin: false, - end: function () { - initData(); - } + }); } }, diff --git a/src/main/resources/static/pages/role/addNewRole.html b/src/main/resources/static/pages/role/addNewRole.html index a8d59b0..abeebcb 100644 --- a/src/main/resources/static/pages/role/addNewRole.html +++ b/src/main/resources/static/pages/role/addNewRole.html @@ -16,6 +16,9 @@ bottom: 20px; right: 20px; } + .layui-table-tool-temp{ + display: none !important; + } /*.layui-input, .layui-textarea {*/ /* display: block;*/ /* width: 100% !important;*/ @@ -39,13 +42,14 @@
-
- +
@@ -55,7 +59,7 @@
- +
@@ -114,23 +118,23 @@
-
+
- +
-
- - - +
+ + +
@@ -150,20 +154,28 @@ + + + \ No newline at end of file diff --git a/src/main/resources/static/pages/role/addUser.html b/src/main/resources/static/pages/role/addUser.html index f1db3c7..2405d17 100644 --- a/src/main/resources/static/pages/role/addUser.html +++ b/src/main/resources/static/pages/role/addUser.html @@ -1,31 +1,32 @@ - - 新增角色---添加人员 - + + 新增角色---添加人员 +
-
-
- - +
+
+ + +
-
-
-
- -
+
+
+ +
+
-
-