From ae158c0ab87c454b9293e62ce7a1d91c54b2b4b7 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 12 Aug 2022 23:00:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3=E4=B8=8E?= =?UTF-8?q?=E6=A0=B8=E5=BF=83=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/manage/CoreManageController.java | 59 +++++- .../pojo/vos/manage/CoreManageUserVO.java | 62 ++++++ .../service/manage/ICoreManageService.java | 38 +++- .../manage/impl/CoreManageServiceImpl.java | 175 +++++++++++++++- .../assets/js/core/manage/department-user.js | 197 ++++++++++++++++++ .../core/manage/list-department-user.html | 46 ++-- .../core/manage/save-department-user.html | 177 +++------------- .../core/manage/update-department-user.html | 89 +++++--- .../department/dao/IDepartmentUserDao.java | 20 ++ .../service/IDepartmentUserService.java | 24 ++- .../impl/DepartmentUserServiceImpl.java | 46 +++- .../mybatis/mapper/department-user-mapper.xml | 93 +++++++++ .../service/group/dao/IGroupUserDao.java | 10 + .../group/service/IGroupUserService.java | 24 +++ .../service/impl/GroupUserServiceImpl.java | 44 +++- .../mybatis/mapper/group-user-mapper.xml | 33 +++ .../position/dao/IPositionUserDao.java | 10 + .../service/IPositionUserService.java | 22 ++ .../service/impl/PositionUserServiceImpl.java | 40 +++- .../mybatis/mapper/position-mapper.xml | 2 - .../mybatis/mapper/position-user-mapper.xml | 34 +++ .../wgink/service/role/dao/IRoleUserDao.java | 10 + .../role/service/IRoleUserService.java | 32 ++- .../service/impl/RoleUserServiceImpl.java | 40 +++- .../resources/mybatis/mapper/role-mapper.xml | 2 - .../mybatis/mapper/role-user-mapper.xml | 39 +++- .../user/controller/api/UserController.java | 23 +- .../user/service/impl/UserServiceImpl.java | 21 +- .../ink/wgink/service/user/util/UserUtil.java | 21 ++ 29 files changed, 1160 insertions(+), 273 deletions(-) create mode 100644 service-core/src/main/java/ink/wgink/service/core/pojo/vos/manage/CoreManageUserVO.java create mode 100644 service-core/src/main/resources/static/assets/js/core/manage/department-user.js diff --git a/service-core/src/main/java/ink/wgink/service/core/controller/api/manage/CoreManageController.java b/service-core/src/main/java/ink/wgink/service/core/controller/api/manage/CoreManageController.java index 881102e7..67abb396 100644 --- a/service-core/src/main/java/ink/wgink/service/core/controller/api/manage/CoreManageController.java +++ b/service-core/src/main/java/ink/wgink/service/core/controller/api/manage/CoreManageController.java @@ -1,20 +1,22 @@ package ink.wgink.service.core.controller.api.manage; +import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.service.core.pojo.vos.manage.CoreManageUserVO; import ink.wgink.service.core.service.manage.ICoreManageService; +import ink.wgink.service.user.util.UserUtil; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -33,6 +35,47 @@ public class CoreManageController extends DefaultBaseController { @Autowired private ICoreManageService coreManageService; + @ApiOperation(value = "新增用户", notes = "新增用户接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save-user") + @CheckRequestBodyAnnotation + public SuccessResult saveUser(@RequestBody CoreManageUserVO coreManageUserVO) { + UserUtil.checkParams(coreManageUserVO); + coreManageService.saveUser(coreManageUserVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除用户", notes = "删除用户接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "用户ID列表，用下划线分隔", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove-user/{ids}") + public SuccessResult removeUser(@PathVariable("ids") String ids) { + coreManageService.removeUser(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改用户", notes = "修改用户接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-user/{userId}") + @CheckRequestBodyAnnotation + public SuccessResult updateUser(@PathVariable("userId") String userId, @RequestBody CoreManageUserVO coreManageUserVO) { + UserUtil.checkParams(coreManageUserVO); + coreManageService.updateUser(userId, coreManageUserVO); + return new SuccessResult(); + } + + @ApiOperation(value = "用户详情", notes = "用户详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-user/{userId}") + public UserDTO getUser(@PathVariable("userId") String userId) { + return coreManageService.getUser(userId); + } + @ApiOperation(value = "组织部门导航列表", notes = "通过组织部门ID获取与查询有关的所有组织部门列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "departmentId", value = "组织部门上级ID", paramType = "path") @@ -45,7 +88,7 @@ public class CoreManageController extends DefaultBaseController { @ApiOperation(value = "组织部门用户列表", notes = "组织部门用户列表接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), + @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "query"), @ApiImplicitParam(name = "roleId", value = "部门ID", paramType = "query"), @ApiImplicitParam(name = "positionId", value = "部门ID", paramType = "query"), @ApiImplicitParam(name = "groupId", value = "部门ID", paramType = "query"), @@ -56,11 +99,11 @@ public class CoreManageController extends DefaultBaseController { @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpage-user/department-id/{departmentId}") - public SuccessResultList> listPageUserByDepartmentId(@PathVariable("departmentId") String departmentId, ListPage page) { + @GetMapping("listpage-user") + public SuccessResultList> listPageUser(ListPage page) { Map requestParams = requestParams(); page.setParams(requestParams); - return coreManageService.listPageUserByDepartmentId(departmentId, page); + return coreManageService.listPageUser(page); } } diff --git a/service-core/src/main/java/ink/wgink/service/core/pojo/vos/manage/CoreManageUserVO.java b/service-core/src/main/java/ink/wgink/service/core/pojo/vos/manage/CoreManageUserVO.java new file mode 100644 index 00000000..4324b74d --- /dev/null +++ b/service-core/src/main/java/ink/wgink/service/core/pojo/vos/manage/CoreManageUserVO.java @@ -0,0 +1,62 @@ +package ink.wgink.service.core.pojo.vos.manage; + +import ink.wgink.annotation.CheckListAnnotation; +import ink.wgink.service.user.pojo.vos.UserVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; +import java.util.List; + +/** + * @ClassName: CoreManageUserVO + * @Description: 用户VO + * @Author: wanggeng + * @Date: 2022/8/12 11:37 + * @Version: 1.0 + */ +@ApiModel +public class CoreManageUserVO extends UserVO { + + @ApiModelProperty(name = "departmentIds", value = "部门ID列表") + @CheckListAnnotation(name = "部门ID列表") + private List departmentIds; + @ApiModelProperty(name = "roleIds", value = "角色ID列表") + private List roleIds; + @ApiModelProperty(name = "positionIds", value = "职位ID列表") + private List positionIds; + @ApiModelProperty(name = "groupIds", value = "组ID列表") + private List groupIds; + + public List getDepartmentIds() { + return departmentIds == null ? new ArrayList() : departmentIds; + } + + public void setDepartmentIds(List departmentIds) { + this.departmentIds = departmentIds; + } + + public List getRoleIds() { + return roleIds == null ? new ArrayList() : roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getPositionIds() { + return positionIds == null ? new ArrayList() : positionIds; + } + + public void setPositionIds(List positionIds) { + this.positionIds = positionIds; + } + + public List getGroupIds() { + return groupIds == null ? new ArrayList() : groupIds; + } + + public void setGroupIds(List groupIds) { + this.groupIds = groupIds; + } +} diff --git a/service-core/src/main/java/ink/wgink/service/core/service/manage/ICoreManageService.java b/service-core/src/main/java/ink/wgink/service/core/service/manage/ICoreManageService.java index 7db20a99..c83cc647 100644 --- a/service-core/src/main/java/ink/wgink/service/core/service/manage/ICoreManageService.java +++ b/service-core/src/main/java/ink/wgink/service/core/service/manage/ICoreManageService.java @@ -4,6 +4,7 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.service.core.pojo.vos.manage.CoreManageUserVO; import java.util.List; import java.util.Map; @@ -17,6 +18,37 @@ import java.util.Map; */ public interface ICoreManageService { + /** + * 保存用户 + * + * @param coreManageUserVO + */ + void saveUser(CoreManageUserVO coreManageUserVO); + + /** + * 删除用户 + * + * @param userIds + */ + void removeUser(List userIds); + + /** + * 修改用户 + * + * @param userId + * @param coreManageUserVO + */ + void updateUser(String userId, CoreManageUserVO coreManageUserVO); + + + /** + * 用户详情 + * + * @param userId + * @return + */ + UserDTO getUser(String userId); + /** * 组织部门导航列表 * @@ -33,11 +65,11 @@ public interface ICoreManageService { List listUser(Map params); /** - * 组织部门用户列表 + * 用户列表 * - * @param departmentId * @param page * @return */ - SuccessResultList> listPageUserByDepartmentId(String departmentId, ListPage page); + SuccessResultList> listPageUser(ListPage page); + } diff --git a/service-core/src/main/java/ink/wgink/service/core/service/manage/impl/CoreManageServiceImpl.java b/service-core/src/main/java/ink/wgink/service/core/service/manage/impl/CoreManageServiceImpl.java index f684fe8f..caaa28d9 100644 --- a/service-core/src/main/java/ink/wgink/service/core/service/manage/impl/CoreManageServiceImpl.java +++ b/service-core/src/main/java/ink/wgink/service/core/service/manage/impl/CoreManageServiceImpl.java @@ -5,14 +5,25 @@ import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.interfaces.user.mongo.IMongoLoginUserService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.pos.DepartmentPO; +import ink.wgink.pojo.pos.GroupPO; +import ink.wgink.pojo.pos.PositionPO; +import ink.wgink.pojo.pos.RolePO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.service.core.dao.manage.ICoreManageDao; +import ink.wgink.service.core.pojo.vos.manage.CoreManageUserVO; import ink.wgink.service.core.service.manage.ICoreManageService; import ink.wgink.service.department.service.IDepartmentService; +import ink.wgink.service.department.service.IDepartmentUserService; +import ink.wgink.service.group.service.IGroupUserService; +import ink.wgink.service.position.service.IPositionUserService; +import ink.wgink.service.role.service.IRoleUserService; +import ink.wgink.service.user.service.IUserService; +import ink.wgink.util.thread.CachedThreadPoolUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,11 +42,54 @@ import java.util.Map; */ @Service public class CoreManageServiceImpl extends DefaultBaseService implements ICoreManageService { - + @Autowired + private ICoreManageDao coreManageDao; + @Autowired + private IUserService userService; @Autowired private IDepartmentService departmentService; @Autowired - private ICoreManageDao coreManageDao; + private IDepartmentUserService departmentUserService; + @Autowired + private IRoleUserService roleUserService; + @Autowired + private IPositionUserService positionUserService; + @Autowired + private IGroupUserService groupUserService; + @Autowired(required = false) + private IMongoLoginUserService mongoLoginUserService; + + @Override + public void saveUser(CoreManageUserVO coreManageUserVO) { + String userId = userService.saveAndReturnId(coreManageUserVO, false); + setUserServices(userId, coreManageUserVO); + updateMongoLoginUser(userId); + } + + @Override + public void removeUser(List userIds) { + userService.remove(userIds); + } + + @Override + public void updateUser(String userId, CoreManageUserVO coreManageUserVO) { + userService.update(userId, coreManageUserVO); + setUserServices(userId, coreManageUserVO); + updateMongoLoginUser(userId); + } + + @Override + public UserDTO getUser(String userId) { + UserDTO userDTO = userService.get(userId); + if (userDTO == null) { + throw new SearchException("用户不存在"); + } + setUserDepartments(userDTO); + setUserRoles(userDTO); + setUserPositions(userDTO); + setUserGroups(userDTO); + return userDTO; + } @Override public List listDepartmentNavPathByDepartmentId(String departmentId) { @@ -55,8 +109,7 @@ public class CoreManageServiceImpl extends DefaultBaseService implements ICoreMa } @Override - public SuccessResultList> listPageUserByDepartmentId(String departmentId, ListPage page) { - page.getParams().put("departmentId", departmentId); + public SuccessResultList> listPageUser(ListPage page) { PageHelper.startPage(page.getPage(), page.getRows()); List userDTOs = listUser(page.getParams()); PageInfo pageInfo = new PageInfo<>(userDTOs); @@ -79,4 +132,118 @@ public class CoreManageServiceImpl extends DefaultBaseService implements ICoreMa DepartmentPO departmentParentPO = departmentService.getPO(departmentPO.getDepartmentParentId()); setDepartmentNav(navList, departmentParentPO); } + + /** + * 设置用户业务 + * + * @param userId + * @param coreManageUserVO + */ + private void setUserServices(String userId, CoreManageUserVO coreManageUserVO) { + List departmentIds = coreManageUserVO.getDepartmentIds(); + departmentUserService.saveAfterDeleteByUserId(departmentIds, userId); + List roleIds = coreManageUserVO.getRoleIds(); + roleUserService.saveAfterDeleteByUserId(roleIds, userId); + List positionIds = coreManageUserVO.getPositionIds(); + positionUserService.saveAfterDeleteByUserId(positionIds, userId); + List groupIds = coreManageUserVO.getGroupIds(); + groupUserService.saveAfterDeleteByUserId(groupIds, userId); + } + + /** + * 设置用户部门 + * + * @param userDTO + */ + private void setUserDepartments(UserDTO userDTO) { + List departmentPOS = departmentUserService.listDepartmentPOByUserId(userDTO.getUserId()); + String departmentIds = ""; + String departmentNames = ""; + for (DepartmentPO departmentPO : departmentPOS) { + if (!StringUtils.isBlank(departmentIds)) { + departmentIds += ","; + departmentNames += ","; + } + departmentIds += departmentPO.getDepartmentId(); + departmentNames += departmentPO.getDepartmentName(); + } + userDTO.setDepartmentIds(departmentIds); + userDTO.setDepartmentNames(departmentNames); + } + + /** + * 设置用户角色 + * + * @param userDTO + */ + private void setUserRoles(UserDTO userDTO) { + List rolePOS = roleUserService.listRolePOByUserId(userDTO.getUserId()); + String roleIds = ""; + String roleNames = ""; + for (RolePO rolePO : rolePOS) { + if (!StringUtils.isBlank(roleIds)) { + roleIds += ","; + roleNames += ","; + } + roleIds += rolePO.getRoleId(); + roleNames += rolePO.getRoleName(); + } + userDTO.setRoleIds(roleIds); + userDTO.setRoleNames(roleNames); + } + + /** + * 设置用户职位 + * + * @param userDTO + */ + private void setUserPositions(UserDTO userDTO) { + List positionPOS = positionUserService.listPositionPOByUserId(userDTO.getUserId()); + String positionIds = ""; + String positionNames = ""; + for (PositionPO positionPO : positionPOS) { + if (!StringUtils.isBlank(positionIds)) { + positionIds += ","; + positionNames += ","; + } + positionIds += positionPO.getPositionId(); + positionNames += positionPO.getPositionName(); + } + userDTO.setPositionIds(positionIds); + userDTO.setPositionNames(positionNames); + } + + /** + * 设置用户组 + * + * @param userDTO + */ + private void setUserGroups(UserDTO userDTO) { + List groupPOS = groupUserService.listGroupPOByUserId(userDTO.getUserId()); + String groupIds = ""; + String groupNames = ""; + for (GroupPO groupPO : groupPOS) { + if (!StringUtils.isBlank(groupIds)) { + groupIds += ","; + groupNames += ","; + } + groupIds += groupPO.getGroupId(); + groupNames += groupPO.getGroupName(); + } + userDTO.setGroupIds(groupIds); + userDTO.setGroupNames(groupNames); + } + + /** + * 更新mongo登录用户 + * + * @param userId + */ + private void updateMongoLoginUser(String userId) { + if (mongoLoginUserService != null) { + CachedThreadPoolUtil.execute(() -> { + mongoLoginUserService.updateByUserId(userId); + }); + } + } } diff --git a/service-core/src/main/resources/static/assets/js/core/manage/department-user.js b/service-core/src/main/resources/static/assets/js/core/manage/department-user.js new file mode 100644 index 00000000..30c71b3d --- /dev/null +++ b/service-core/src/main/resources/static/assets/js/core/manage/department-user.js @@ -0,0 +1,197 @@ +/** + * 关闭窗口 + */ +function closeBox() { + parent.layer.close(parent.layer.getFrameIndex(window.name)); +} + +/** + * 初始化下拉树 + * @param $ + * @param layuiInputTree + */ +function initMultiSelectInputTree($, layuiInputTree) { + /** + * 设置选择数据 + * @param ids + * @param names + */ + function setSelectedData(selectedDatas, ids, names) { + if (!ids) { + return; + } + ids = ids.split(','); + names = names.split(','); + $.each(ids, function (index, item) { + selectedDatas.push({ + id: item, + name: names[index] + }) + }) + } + + // 组织部门选择 + function initDepartmentSelect() { + layuiInputTree.initMultiSelect({ + id: 'departmentNames', + url: 'api/department/listztree', + checkboxType: {Y: '', N: ''}, + getSelectedDatas: function () { + var selectedDepartments = [] + setSelectedData(selectedDepartments, $('#departmentIds').val(), $('#departmentNames').val()); + return selectedDepartments; + }, + onConfirm: function (zTree, selectedNodes) { + if (selectedNodes.length == 0) { + $('#departmentIds').val(''); + return; + } + var departmentIds = ''; + $.each(selectedNodes, function (index, item) { + if (departmentIds != '') { + departmentIds += ','; + } + departmentIds += item.id; + }) + $('#departmentIds').val(departmentIds); + } + }) + } + + // 角色选择 + function initRoleSelect() { + layuiInputTree.initMultiSelect({ + id: 'roleNames', + url: 'api/role/listztree', + checkboxType: {Y: '', N: ''}, + getSelectedDatas: function () { + var selectedRoles = []; + setSelectedData(selectedRoles, $('#roleIds').val(), $('#roleNames').val()); + return selectedRoles; + }, + onConfirm: function (zTree, selectedNodes) { + if (selectedNodes.length == 0) { + $('#roleIds').val(''); + return; + } + var roleIds = ''; + $.each(selectedNodes, function (index, item) { + if (roleIds != '') { + roleIds += ','; + } + roleIds += item.id; + }) + $('#roleIds').val(roleIds); + } + }) + } + + // 职位选择 + function initPositionSelect() { + layuiInputTree.initMultiSelect({ + id: 'positionNames', + url: 'api/position/listztree', + checkboxType: {Y: '', N: ''}, + getSelectedDatas: function () { + var selectedPositions = []; + setSelectedData(selectedPositions, $('#positionIds').val(), $('#positionNames').val()); + return selectedPositions; + }, + onConfirm: function (zTree, selectedNodes) { + if (selectedNodes.length == 0) { + $('#positionIds').val(''); + return; + } + var positionIds = ''; + $.each(selectedNodes, function (index, item) { + if (positionIds != '') { + positionIds += ','; + } + positionIds += item.id; + }) + $('#positionIds').val(positionIds); + } + }) + } + + // 组选择 + function initGroupSelect() { + layuiInputTree.initMultiSelect({ + id: 'groupNames', + url: 'api/group/listztree', + checkboxType: {Y: '', N: ''}, + getSelectedDatas: function () { + var selectedGroups = []; + setSelectedData(selectedGroups, $('#groupIds').val(), $('#groupNames').val()); + return selectedGroups; + }, + onConfirm: function (zTree, selectedNodes) { + if (selectedNodes.length == 0) { + $('#groupIds').val(''); + return; + } + var groupIds = ''; + $.each(selectedNodes, function (index, item) { + if (groupIds != '') { + groupIds += ','; + } + groupIds += item.id; + }) + $('#groupIds').val(groupIds); + } + }) + } + + initDepartmentSelect(); + initRoleSelect(); + initPositionSelect(); + initGroupSelect(); +} + +/** + * + * @param laydate + */ +function initDate(laydate) { + laydate.render({ + elem: '#userExpiredDate', + trigger: 'click', + format: 'yyyy-MM-dd HH:mm:ss' + }); +} + +/** + * 设置ID列表 + * @param $ + * @param formDataField + */ +function setIds($, formDataField) { + var departmentIds = $('#departmentIds').val(); + if (departmentIds) { + departmentIds = departmentIds.split(','); + } else { + departmentIds = []; + } + var roleIds = $('#roleIds').val(); + if (roleIds) { + roleIds = roleIds.split(','); + } else { + roleIds = []; + } + var positionIds = $('#positionIds').val(); + if (positionIds) { + positionIds = positionIds.split(','); + } else { + positionIds = []; + } + var groupIds = $('#groupIds').val(); + if (groupIds) { + groupIds = groupIds.split(','); + } else { + groupIds = []; + } + formDataField.departmentIds = departmentIds; + formDataField.roleIds = roleIds; + formDataField.positionIds = positionIds; + formDataField.groupIds = groupIds; +} \ No newline at end of file diff --git a/service-core/src/main/resources/templates/core/manage/list-department-user.html b/service-core/src/main/resources/templates/core/manage/list-department-user.html index 22d39d0f..97658bab 100644 --- a/service-core/src/main/resources/templates/core/manage/list-department-user.html +++ b/service-core/src/main/resources/templates/core/manage/list-department-user.html @@ -52,15 +52,16 @@ +
+ +
-
@@ -102,7 +103,8 @@ var layuiInputTree = new LayuiInputTree(layui); var queryParams = top.restAjax.params(window.location.href); var departmentId = queryParams.departmentId; - var tableUrl = 'api/core/manage/listpage-user/department-id/{departmentId}'; + var tableUserUrl = 'api/core/manage/listpage-user'; + var tableUrl = tableUserUrl + '?departmentId={departmentId}'; // 初始化表格 function initTable() { @@ -257,7 +259,7 @@ } // 重载表格 function reloadTable(currentPage) { - table.reload('dataTable', { + var reloadTableObj = { where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), @@ -271,7 +273,14 @@ page: { curr: currentPage }, - }); + }; + var searchLevel = $('#searchLevel').val(); + if(searchLevel === 'global') { + reloadTableObj.url = top.restAjax.path(tableUserUrl, []); + } else { + reloadTableObj.url = top.restAjax.path(tableUrl, [departmentId]); + } + table.reload('dataTable', reloadTableObj); } // 初始化日期 function initDate() { @@ -305,7 +314,10 @@ // 角色下拉树选择 layuiInputTree.initSelect({ id: 'roleName', - zTreeUrl: 'api/role/listztree', + url: 'api/role/listztree', + getSelectedData: function() { + return {id: $('#roleId').val(), name: $('#roleName').val()} + }, onConfirm: function(zTree, selectedNode) { if(!selectedNode) { $('#roleId').val(''); @@ -317,7 +329,10 @@ // 职位下拉树选择 layuiInputTree.initSelect({ id: 'positionName', - zTreeUrl: 'api/position/listztree', + url: 'api/position/listztree', + getSelectedData: function() { + return {id: $('#positionId').val(), name: $('#positionName').val()} + }, onConfirm: function(zTree, selectedNode) { if(!selectedNode) { $('#positionId').val(''); @@ -329,7 +344,10 @@ // 用户组下拉树选择 layuiInputTree.initSelect({ id: 'groupName', - zTreeUrl: 'api/group/listztree', + url: 'api/group/listztree', + getSelectedData: function() { + return {id: $('#groupId').val(), name: $('#groupName').val()} + }, onConfirm: function(zTree, selectedNode) { if(!selectedNode) { $('#groupId').val(''); @@ -348,7 +366,7 @@ yes: function (index) { top.dialog.close(index); var layIndex; - top.restAjax.delete(top.restAjax.path('api/user/remove/{ids}', [ids]), {}, null, function (code, data) { + top.restAjax.delete(top.restAjax.path('api/core/manage/remove-user/{ids}', [ids]), {}, null, function (code, data) { top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}); reloadTable(); }, function (code, data) { @@ -407,7 +425,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/user/update?userId={id}', [checkDatas[0].userId]), + content: top.restAjax.path('route/core/manage/update-department-user?userId={id}', [checkDatas[0].userId]), end: function() { reloadTable(); } diff --git a/service-core/src/main/resources/templates/core/manage/save-department-user.html b/service-core/src/main/resources/templates/core/manage/save-department-user.html index be4460cc..3d08345c 100644 --- a/service-core/src/main/resources/templates/core/manage/save-department-user.html +++ b/service-core/src/main/resources/templates/core/manage/save-department-user.html @@ -27,22 +27,20 @@
- -
-
-
- -
- +
- + +
+
+
+ +
+ +
@@ -59,11 +57,10 @@
普通用户：具有APP登录权限且参与APP业务的用户
公共用户：来自小程序、公众号等公共平台自动创建且参与此类业务的的用户
-
- +
+
- - +
@@ -96,29 +93,29 @@
- - + +
- - + +
- - + +
- - + +
@@ -142,6 +139,7 @@
+ +