From 1d84a3c62eeee429f7d7d6339bcf9b504a9d7277 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 16 一月 2025 16:01:33 +0800
Subject: [PATCH] DNC流程配置、DNC部门处理
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DepartmentController.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DepartmentController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DepartmentController.java
index b2db9da..73238d4 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DepartmentController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DepartmentController.java
@@ -3,12 +3,18 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.dnc.request.DepartmentRequest;
import org.jeecg.modules.dnc.response.*;
import org.jeecg.modules.dnc.service.IDepartmentService;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.model.SysDepartTreeModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -144,4 +150,70 @@
list = Collections.emptyList();
return new QueryListResponseResult<>(CommonCode.SUCCESS, list);
}
+
+
+ @AutoLog(value = "DNC閮ㄩ棬绠＄悊-鑾峰彇鏍戠粨鏋�")
+ @ApiOperation(value = "DNC閮ㄩ棬绠＄悊-鑾峰彇鏍戠粨鏋�", notes = "DNC閮ㄩ棬绠＄悊-鑾峰彇鏍戠粨鏋�")
+ @GetMapping("/load/queryTreeList")
+ public QueryListResponseResult<CommonJsonTree> queryTreeList() {
+ List<CommonJsonTree> tree = departmentService.loadTree();
+ if(tree == null)
+ tree = Collections.emptyList();
+ return new QueryListResponseResult(CommonCode.SUCCESS, tree);
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁 鏌ュ嚭鎵�鏈夐儴闂�,骞朵互鏍戠粨鏋勬暟鎹牸寮忓搷搴旂粰鍓嶇
+ *
+ * @return
+ */
+ @GetMapping(value = "/queryTreeList")
+ public Result<List<DepartmentTreeModel>> queryTreeList(@RequestParam(name = "ids", required = false) String ids) {
+ Result<List<DepartmentTreeModel>> result = new Result<>();
+ try {
+ // 浠庡唴瀛樹腑璇诲彇
+// List<SysDepartTreeModel> list =FindsDepartsChildrenUtil.getSysDepartTreeList();
+// if (CollectionUtils.isEmpty(list)) {
+// list = sysDepartService.queryTreeList();
+// }
+ if(oConvertUtils.isNotEmpty(ids)){
+ List<DepartmentTreeModel> departList = departmentService.queryTreeList(ids);
+ result.setResult(departList);
+ }else{
+ List<DepartmentTreeModel> list = departmentService.queryTreeList();
+ result.setResult(list);
+ }
+ result.setSuccess(true);
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ }
+ return result;
+ }
+
+ /**
+ * <p>
+ * 閮ㄩ棬鎼滅储鍔熻兘鏂规硶,鏍规嵁鍏抽敭瀛楁ā绯婃悳绱㈢浉鍏抽儴闂�
+ * </p>
+ *
+ * @param keyWord
+ * @return
+ */
+ @RequestMapping(value = "/searchBy", method = RequestMethod.GET)
+ public Result<List<DepartmentTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) {
+ Result<List<DepartmentTreeModel>> result = new Result<List<DepartmentTreeModel>>();
+ //閮ㄩ棬鏌ヨ锛宮yDeptSearch涓�1鏃朵负鎴戠殑閮ㄩ棬鏌ヨ锛岀櫥褰曠敤鎴蜂负涓婄骇鏃舵煡鍙煡璐熻矗閮ㄩ棬涓嬫暟鎹�
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String departIds = null;
+ if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){
+ departIds = user.getDepartIds();
+ }
+ List<DepartmentTreeModel> treeList = this.departmentService.searchByKeyWord(keyWord,myDeptSearch,departIds);
+ if (treeList == null || treeList.size() == 0) {
+ result.setSuccess(false);
+ result.setMessage("鏈煡璇㈠尮閰嶆暟鎹紒");
+ return result;
+ }
+ result.setResult(treeList);
+ return result;
+ }
}
--
Gitblit v1.9.3