From c6b25668f3c53d9448df2c68904db4bf673d1eb7 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期一, 06 十一月 2023 14:54:28 +0800 Subject: [PATCH] 部门加导入优化 --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index 500c02b..7580fa2 100644 --- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -3,6 +3,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -120,7 +122,32 @@ } return result; } + @GetMapping("/myTree") + public Result<List<SysDepartTreeModel>> myTree(@RequestParam(name = "ids", required = false) String ids){ + SysDepartTreeModel sysDepartTreeModel = new SysDepartTreeModel(); + sysDepartTreeModel.setKey("-1"); + sysDepartTreeModel.setTitle("閮ㄩ棬绠$悊"); + Result<List<SysDepartTreeModel>> result = new Result<>(); + List<SysDepartTreeModel> fristList = new ArrayList<>(); + try { + if(oConvertUtils.isNotEmpty(ids)){ + List<SysDepartTreeModel> departList = sysDepartService.queryTreeList(ids); + sysDepartTreeModel.setChildren(departList); + fristList.add(sysDepartTreeModel); + result.setResult(fristList); + }else{ + List<SysDepartTreeModel> list = sysDepartService.queryTreeList(); + sysDepartTreeModel.setChildren(list); + fristList.add(sysDepartTreeModel); + result.setResult(fristList); + } + result.setSuccess(true); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + return result; + } @AutoLog(value = "閮ㄩ棬琛�-鏍规嵁鐢ㄦ埛id鑾峰彇閮ㄩ棬涓嬫媺鏍戦�夐」") @ApiOperation(value = "閮ㄩ棬琛�-鏍规嵁鐢ㄦ埛id鑾峰彇閮ㄩ棬涓嬫媺鏍戦�夐」", notes = "閮ㄩ棬琛�-鏍规嵁鐢ㄦ埛id鑾峰彇閮ㄩ棬涓嬫媺鏍戦�夐」") @GetMapping(value = "/loadDepartTreeOptions") @@ -226,6 +253,7 @@ } return result; } + /** * 缂栬緫鏁版嵁 缂栬緫閮ㄩ棬鐨勯儴鍒嗘暟鎹�,骞朵繚瀛樺埌鏁版嵁搴� @@ -561,4 +589,15 @@ result.setResult(sysUsers); return result; } + + @GetMapping(value = "/list") + public Result<IPage<SysDepart>> queryPageList(SysDepart sysDepart, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap()); + Page<SysDepart> page = new Page<SysDepart>(pageNo, pageSize); + IPage<SysDepart> pageList = sysDepartService.page(page, queryWrapper); + return Result.OK(pageList); + } } -- Gitblit v1.9.3