From abb0d631ffed8b67b0a78205ba127b46a4cb546b Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 16:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
index c2a58b3..19521e6 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
@@ -1,5 +1,6 @@
package cn.huge.module.ctuser.controller.web;
+import cn.huge.base.common.dto.SelectTermDTO;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.base.config.CurrentUser;
@@ -19,8 +20,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* @title: 客户组织信息表接口api-web端
@@ -205,7 +204,7 @@
if (StringUtils.isNotBlank(dispStatus)){
terms.put("dispStatus", dispStatus);
}
- // 删除状态，0：已删除，1：未删除
+ // 删除状态，0：未删除，1：已删除
String deleteStatus = request.getParameter("deleteStatus");
if (StringUtils.isNotBlank(deleteStatus)){
terms.put("deleteStatus", deleteStatus);
@@ -316,7 +315,7 @@
/**
* 获取所有组织（包含所有下级子组织）树形结构
- * @url {ctx}/api/v1/ctUnit/listUnitTree
+ * @url {ctx}/api/web/ctUnit/listUnitTree
* @param userId 登录用户标识称
* @return Object
*/
@@ -335,7 +334,7 @@
/**
* 获取组织详情（包含组织下的部门详情）
- * @url {ctx}/api/v1/ctUnit/getUnitAndDept?id=
+ * @url {ctx}/api/web/ctUnit/getUnitAndDept?id=
* @param id 组织编号
* @return Object
*/
@@ -349,4 +348,37 @@
return ReturnFailUtils.getRepInfo( "查询失败", null);
}
}
+
+ /**
+ * 根据主键编号删除单位
+ * @url {ctx}/api/web/ctUnit/removeByIds
+ * @param ids 主键编号
+ * @return Object
+ * @throws Exception
+ */
+ @GetMapping("/removeByIds")
+ public Object removeByIds(@RequestParam(value = "ids") String ids) {
+ try {
+ service.removeById(ids);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ log.error("Controller接口[CtUnitController.removeByIds]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 选择组织
+ * @url {ctx}/api/web/ctUnit/unitChoose
+ * @return Object
+ */
+ @GetMapping("/unitChoose")
+ public Object unitChoose(@CurrentUser String userId) {
+ try {
+ List<SelectTermDTO> unitSelectTerms = service.unitChoose(userId);
+ return ReturnSucUtils.getRepInfo(unitSelectTerms);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0