diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionBaseService.java index bcd22b75..45a6e07a 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/position/IPositionBaseService.java @@ -24,10 +24,10 @@ public interface IPositionBaseService { /** * 全部职位JSON列表 * - * @param groupParentId + * @param positionParentId * @return */ - List listAllByParentId(String groupParentId); + List listAllByParentId(String positionParentId); /** * 职位列表,递归获取全部内容 @@ -80,10 +80,10 @@ public interface IPositionBaseService { /** * 职位列表 * - * @param groupIds 用户ID列表 + * @param positionIds 用户ID列表 * @return */ - List list(List groupIds); + List listByPositionIds(List positionIds); /** * 职位列表 diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleBaseService.java index 3c25bfdd..554e95f7 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/role/IRoleBaseService.java @@ -45,6 +45,14 @@ public interface IRoleBaseService { */ List list(Map params); + /** + * 角色列表 + * + * @param ids + * @return + */ + List listByRoleIds(List roleIds); + /** * 角色列表 * diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/position/IPositionRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/position/IPositionRemoteService.java index bac7dace..87f88fdb 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/position/IPositionRemoteService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/position/IPositionRemoteService.java @@ -42,14 +42,14 @@ public interface IPositionRemoteService { @RemoteGetMethod("/list") List list(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map params); - @RemotePostMethod("/list/ids") - List listByIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); + @RemotePostMethod("/list/position-ids") + List listByPositionIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); @RemoteGetMethod("/list-po") List listPO(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map params); @RemotePostMethod("/list-po/ids") - List listPOByIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); + List listPOByPositionIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); @RemoteGetMethod("/count") SuccessResultData count(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map params); diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleRemoteService.java index 6f73521e..4d1f58a1 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleRemoteService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/role/IRoleRemoteService.java @@ -50,4 +50,7 @@ public interface IRoleRemoteService { @RemoteGetMethod("/count") SuccessResultData count(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteQueryParamsMap Map params); + + @RemotePostMethod("/list/role-ids") + List listByRoleIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); } diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/position/impl/PositionServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/position/impl/PositionServiceImpl.java index 03cb6cb1..c1ed9f72 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/position/impl/PositionServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/position/impl/PositionServiceImpl.java @@ -15,6 +15,7 @@ import ink.wgink.properties.ApiPathProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -34,9 +35,9 @@ public class PositionServiceImpl extends DefaultBaseService implements IPosition private ApiPathProperties apiPathProperties; @Override - public List listAllByParentId(String groupParentId) { + public List listAllByParentId(String positionParentId) { Map params = getHashMap(2); - params.put("parentId", groupParentId); + params.put("parentId", positionParentId); return listAll(params); } @@ -71,10 +72,13 @@ public class PositionServiceImpl extends DefaultBaseService implements IPosition } @Override - public List list(List positionIds) { + public List listByPositionIds(List positionIds) { + if (positionIds == null && positionIds.isEmpty()) { + return new ArrayList<>(); + } IdsVO idsVO = new IdsVO(); idsVO.setIds(positionIds); - return positionRemoteService.listByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); + return positionRemoteService.listByPositionIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); } @Override @@ -86,7 +90,7 @@ public class PositionServiceImpl extends DefaultBaseService implements IPosition public List listPO(List positionIds) { IdsVO idsVO = new IdsVO(); idsVO.setIds(positionIds); - return positionRemoteService.listPOByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); + return positionRemoteService.listPOByPositionIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); } @Override diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleServiceImpl.java index 0ff989cf..e1892ab0 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/role/impl/RoleServiceImpl.java @@ -15,6 +15,7 @@ import ink.wgink.properties.ApiPathProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -48,6 +49,16 @@ public class RoleServiceImpl extends DefaultBaseService implements IRoleService return roleRemoteService.list(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); } + @Override + public List listByRoleIds(List roleIds) { + if(roleIds == null || roleIds.isEmpty()) { + return new ArrayList<>(); + } + IdsVO idsVO = new IdsVO(); + idsVO.setIds(roleIds); + return roleRemoteService.listByRoleIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); + } + @Override public List listPO(Map params) { return roleRemoteService.listPO(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), params); diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java index 5e3cd8c4..76424625 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java @@ -221,12 +221,12 @@ public class DepartmentController extends DefaultBaseController { } @ApiOperation(value = "组织部门列表", notes = "组织部门列表接口") - @ApiImplicitParams({ - @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path") - }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @PostMapping("list/ids") public List list(@RequestBody IdsVO idsVO) { + if (idsVO.getIds().isEmpty()) { + throw new ParamsException("id列表不能为空"); + } return departmentService.listByIds(idsVO.getIds()); } diff --git a/service-department/src/main/resources/templates/department/list-tree-check.html b/service-department/src/main/resources/templates/department/list-tree-check.html index b6436993..2f5eb113 100644 --- a/service-department/src/main/resources/templates/department/list-tree-check.html +++ b/service-department/src/main/resources/templates/department/list-tree-check.html @@ -52,8 +52,8 @@ var $win = $(window); var resizeTimeout = null; var zTree; - var checkedIds = top.dialog.dialogData.checkedIds ? top.dialog.dialogData.checkedIds : []; - var checkedNodes = []; + var checkedDepartmentIds = top.dialog.dialogData.checkedDepartmentIds ? [].concat(top.dialog.dialogData.checkedDepartmentIds) : []; + var checkedDepartmentNodes = []; var checkedDepartmentMap = new Map(); function closeBox() { @@ -86,23 +86,23 @@ * 初始化勾选节点 */ function initCheckNodes(callback) { - if(!checkedIds || checkedIds.length == 0) { + if(!checkedDepartmentIds || checkedDepartmentIds.length == 0) { callback ? callback() : ''; return; } top.restAjax.post(top.restAjax.path('api/department/list/ids', []), { - ids: [].concat(checkedIds) + ids: checkedDepartmentIds }, null, function(code, data) { $('#checkedNodeBox').empty(); - var checkedNodes = ''; + var checkedDepartmentNodes = ''; for(var i = 0, item; item = data[i++];) { - checkedNodes += getCheckedNode(item.departmentId, item.departmentName); + checkedDepartmentNodes += getCheckedNode(item.departmentId, item.departmentName); checkedDepartmentMap.set(item.departmentId, { id: item.departmentId, name: item.departmentName }); } - $('#checkedNodeBox').append(checkedNodes); + $('#checkedNodeBox').append(checkedDepartmentNodes); callback ? callback() : ''; }, function(code, data) { top.dialog.msg(data.msg); @@ -113,11 +113,11 @@ function refreshCheckedNodes() { var nodes = zTree.getCheckedNodes(true); $('#checkedNodeBox').empty(); - var checkedNodes = ''; - for(var i = 0, item; item = nodes[i++];) { - checkedNodes += getCheckedNode(item.id, item.name); + var checkedDepartmentNodes = ''; + for(var [k, v] of checkedDepartmentMap) { + checkedDepartmentNodes += getCheckedNode(v.id, v.name); } - $('#checkedNodeBox').append(checkedNodes); + $('#checkedNodeBox').append(checkedDepartmentNodes); } // 初始化树 function initThree() { @@ -169,7 +169,7 @@ } function initCheckedDepartmentMap() { - var checkedDepartments = checkedNodes; + var checkedDepartments = checkedDepartmentNodes; if(!checkedDepartments) { return; } @@ -201,15 +201,18 @@ var departmentId = this.dataset.departmentId; checkedDepartmentMap.delete(departmentId); var node = zTree.getNodeByParam('id', departmentId); - zTree.checkNode(node, false, false); + // 未加载不删除 + if(node) { + zTree.checkNode(node, false, false); + } refreshCheckedNodes(); }) $('.submit').on('click', function() { checkedDepartmentMap.forEach(function(item) { - checkedNodes.push(item); + checkedDepartmentNodes.push(item); }); - top.dialog.dialogData.checkedNodes = checkedNodes; + top.dialog.dialogData.checkedDepartmentNodes = checkedDepartmentNodes; closeBox(); }); }); diff --git a/service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java b/service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java index 3bdbfd0a..6f03faf3 100644 --- a/service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java +++ b/service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java @@ -2,6 +2,7 @@ package ink.wgink.service.position.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; @@ -58,35 +59,35 @@ public class PositionController extends DefaultBaseController { @ApiOperation(value = "职位修改", notes = "职位修改接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "groupId", value = "职位ID", paramType = "path") + @ApiImplicitParam(name = "positionId", value = "职位ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("update/{groupId}") + @PutMapping("update/{positionId}") @CheckRequestBodyAnnotation - public SuccessResult update(@PathVariable("groupId") String groupId, @RequestBody PositionVO positionVO) { - positionService.update(groupId, positionVO); + public SuccessResult update(@PathVariable("positionId") String positionId, @RequestBody PositionVO positionVO) { + positionService.update(positionId, positionVO); return new SuccessResult(); } @ApiOperation(value = "职位列表", notes = "职位列表接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "groupParentId", value = "职位上级ID", paramType = "path") + @ApiImplicitParam(name = "positionParentId", value = "职位上级ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listallbyparentid/{groupParentId}") - public List listAllByParentId(@PathVariable("groupParentId") String groupParentId) { - return positionService.listAllByParentId(groupParentId); + @GetMapping("listallbyparentid/{positionParentId}") + public List listAllByParentId(@PathVariable("positionParentId") String positionParentId) { + return positionService.listAllByParentId(positionParentId); } @ApiOperation(value = "职位详情", notes = "职位详情接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "groupId", value = "职位ID", paramType = "path") + @ApiImplicitParam(name = "positionId", value = "职位ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("get/{groupId}") - public PositionDTO get(@PathVariable("groupId") String groupId) { + @GetMapping("get/{positionId}") + public PositionDTO get(@PathVariable("positionId") String positionId) { Map params = getParams(); - params.put("groupId", groupId); + params.put("positionId", positionId); return positionService.get(params); } @@ -98,11 +99,11 @@ public class PositionController extends DefaultBaseController { @GetMapping("listztree") public List listZTree() { Map params = requestParams(); - String groupParentId = "0"; + String positionParentId = "0"; if (!StringUtils.isBlank(params.get(ISystemConstant.PARAMS_ID) == null ? null : params.get(ISystemConstant.PARAMS_ID).toString())) { - groupParentId = params.get(ISystemConstant.PARAMS_ID).toString(); + positionParentId = params.get(ISystemConstant.PARAMS_ID).toString(); } - params.put("groupParentId", groupParentId); + params.put("positionParentId", positionParentId); return positionService.listZTree(params); } @@ -119,20 +120,23 @@ public class PositionController extends DefaultBaseController { @GetMapping("listpage") public SuccessResultList> listPage(ListPage page) { Map params = requestParams(); - String groupParentId = "0"; + String positionParentId = "0"; if (!StringUtils.isBlank(params.get("parentId") == null ? null : params.get("parentId").toString())) { - groupParentId = params.get("parentId").toString(); + positionParentId = params.get("parentId").toString(); } - params.put("groupParentId", groupParentId); + params.put("positionParentId", positionParentId); page.setParams(params); return positionService.listPage(page); } @ApiOperation(value = "通过ID列表获取职位列表", notes = "通过ID列表获取用户职位接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("listbyids") + @PostMapping("list/position-ids") public List listByIds(@RequestBody IdsVO idsVO) { - return positionService.list(idsVO.getIds()); + if (idsVO.getIds().isEmpty()) { + throw new ParamsException("id列表不能为空"); + } + return positionService.listByPositionIds(idsVO.getIds()); } } diff --git a/service-position/src/main/java/ink/wgink/service/position/controller/resources/PositionResourceController.java b/service-position/src/main/java/ink/wgink/service/position/controller/resources/PositionResourceController.java index 2f360ef1..476dae42 100644 --- a/service-position/src/main/java/ink/wgink/service/position/controller/resources/PositionResourceController.java +++ b/service-position/src/main/java/ink/wgink/service/position/controller/resources/PositionResourceController.java @@ -123,9 +123,9 @@ public class PositionResourceController extends DefaultBaseController { @ApiOperation(value = "通过ID列表获取职位列表", notes = "通过ID列表获取用户职位接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("list/ids") + @PostMapping("list/position-ids") public List listByIds(@RequestBody IdsVO idsVO) { - return positionService.list(idsVO.getIds()); + return positionService.listByPositionIds(idsVO.getIds()); } @ApiOperation(value = "取职位列表", notes = "用户职位接口") diff --git a/service-position/src/main/java/ink/wgink/service/position/controller/route/PositionRouteController.java b/service-position/src/main/java/ink/wgink/service/position/controller/route/PositionRouteController.java index 0ef65bba..42e1b63e 100644 --- a/service-position/src/main/java/ink/wgink/service/position/controller/route/PositionRouteController.java +++ b/service-position/src/main/java/ink/wgink/service/position/controller/route/PositionRouteController.java @@ -41,4 +41,9 @@ public class PositionRouteController { public ModelAndView listTree() { return new ModelAndView("position/list-tree"); } + + @GetMapping("list-tree-check") + public ModelAndView listTreeCheck() { + return new ModelAndView("position/list-tree-check"); + } } diff --git a/service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java b/service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java index b0d30cd7..0fde2127 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java +++ b/service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java @@ -34,9 +34,9 @@ public interface IPositionService extends IPositionBaseService, IPositionCheckSe /** * 修改职位 * - * @param groupId + * @param positionId * @param positionVO * @return */ - void update(String groupId, PositionVO positionVO); + void update(String positionId, PositionVO positionVO); } diff --git a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java index b0f46eb6..67f006db 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java +++ b/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java @@ -117,7 +117,7 @@ public class PositionServiceImpl extends DefaultBaseService implements IPosition } @Override - public List list(List positionIds) { + public List listByPositionIds(List positionIds) { Map params = getHashMap(2); params.put("positionIds", positionIds); return list(params); diff --git a/service-position/src/main/resources/templates/position/list-tree-check.html b/service-position/src/main/resources/templates/position/list-tree-check.html new file mode 100644 index 00000000..5210e765 --- /dev/null +++ b/service-position/src/main/resources/templates/position/list-tree-check.html @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + +
+
+
+
+
+
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java index 516ed381..05596230 100644 --- a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java +++ b/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java @@ -10,6 +10,7 @@ import ink.wgink.pojo.dtos.role.RoleDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.pojo.vos.IdsVO; import ink.wgink.service.role.pojo.vos.RoleVO; import ink.wgink.service.role.service.IRoleService; import io.swagger.annotations.*; @@ -129,4 +130,14 @@ public class RoleController extends DefaultBaseController { return roleService.listPage(page); } + @ApiOperation(value = "角色列表", notes = "角色列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("list/role-ids") + public List listByRoleIds(@RequestBody IdsVO idsVO) { + if (idsVO.getIds().isEmpty()) { + throw new ParamsException("id列表不能为空"); + } + return roleService.listByRoleIds(idsVO.getIds()); + } + } diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleResourceController.java b/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleResourceController.java index d4cd94c5..69ae5ae8 100644 --- a/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleResourceController.java +++ b/service-role/src/main/java/ink/wgink/service/role/controller/resources/RoleResourceController.java @@ -1,6 +1,7 @@ package ink.wgink.service.role.controller.resources; import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; @@ -151,4 +152,14 @@ public class RoleResourceController extends DefaultBaseController { return new SuccessResultData<>(count); } + @ApiOperation(value = "角色列表", notes = "角色列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("list/role-ids") + public List listByRoleIds(@RequestBody IdsVO idsVO) { + if (idsVO.getIds().isEmpty()) { + throw new ParamsException("id列表不能为空"); + } + return roleService.listByRoleIds(idsVO.getIds()); + } + } diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/route/RoleRouteController.java b/service-role/src/main/java/ink/wgink/service/role/controller/route/RoleRouteController.java index 47fc9ce5..b2a1ff2d 100644 --- a/service-role/src/main/java/ink/wgink/service/role/controller/route/RoleRouteController.java +++ b/service-role/src/main/java/ink/wgink/service/role/controller/route/RoleRouteController.java @@ -2,8 +2,6 @@ package ink.wgink.service.role.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.properties.AccessControlProperties; -import ink.wgink.properties.BaseProperties; -import ink.wgink.properties.ServerProperties; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -44,6 +42,11 @@ public class RoleRouteController { return new ModelAndView("role/list-tree"); } + @GetMapping("list-tree-check") + public ModelAndView listTreeCheck() { + return new ModelAndView("role/list-tree-check"); + } + @GetMapping("list") public ModelAndView list() { ModelAndView mv = new ModelAndView("role/list"); diff --git a/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java b/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java index 575bcab0..9214d491 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java @@ -1,16 +1,10 @@ package ink.wgink.service.role.service; -import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.role.IRoleBaseService; import ink.wgink.interfaces.role.IRoleCheckService; -import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.dtos.ZTreeDTO; -import ink.wgink.pojo.dtos.role.RoleDTO; -import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.service.role.pojo.vos.RoleVO; import java.util.List; -import java.util.Map; /** * When you feel like quitting. Think about why you started @@ -103,5 +97,4 @@ public interface IRoleService extends IRoleBaseService, IRoleCheckService { void updateRoleDataRight(String roleId, String roleDataRight); - } diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java index 368336f9..36d6aeb8 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java @@ -108,6 +108,13 @@ public class RoleServiceImpl extends DefaultBaseService implements IRoleService return destRoleDTO; } + @Override + public List listByRoleIds(List roleIds) { + Map params = getHashMap(2); + params.put("roleIds", roleIds); + return list(params); + } + @Override public List listPO(Map params) { return roleDao.listPO(params); diff --git a/service-role/src/main/resources/mybatis/mapper/role-mapper.xml b/service-role/src/main/resources/mybatis/mapper/role-mapper.xml index 2b042a67..3daf9bd2 100644 --- a/service-role/src/main/resources/mybatis/mapper/role-mapper.xml +++ b/service-role/src/main/resources/mybatis/mapper/role-mapper.xml @@ -137,6 +137,13 @@ sys_role WHERE is_delete = 0 + + AND + role_id IN + + #{roleIds[${index}]} + + AND role_parent_id = #{roleParentId} diff --git a/service-role/src/main/resources/templates/role/list-tree-check.html b/service-role/src/main/resources/templates/role/list-tree-check.html new file mode 100644 index 00000000..de9ac9b1 --- /dev/null +++ b/service-role/src/main/resources/templates/role/list-tree-check.html @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      + + + + \ No newline at end of file