From 9253cb6be1350140769b290db640c517c0c1dbbc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 03 七月 2025 15:07:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
index 795d137..e04b991 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java
@@ -87,22 +87,22 @@
return result;
}
- @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
- @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
- @GetMapping(value = "/loadMaintainDepartTreeOptions")
- public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() {
- Result<List<RepairDepartIdModel>> result = new Result<>();
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- try {
- List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId);
- result.setSuccess(true);
- result.setResult(list);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- return result;
- }
+// @AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
+// @ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」", notes = "缁翠慨閮ㄩ棬鐝粍-鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」")
+// @GetMapping(value = "/loadMaintainDepartTreeOptions")
+// public Result<List<RepairDepartIdModel>> loadMaintainDepartTreeOptions() {
+// Result<List<RepairDepartIdModel>> result = new Result<>();
+// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+// String userId = user.getId();
+// try {
+// List<RepairDepartIdModel> list = eamBaseRepairDepartService.loadMaintainDepartTreeOptions(userId);
+// result.setSuccess(true);
+// result.setResult(list);
+// } catch (Exception e) {
+// log.error(e.getMessage(), e);
+// }
+// return result;
+// }
@AutoLog(value = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎")
@ApiOperation(value = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎", notes = "缁翠慨閮ㄩ棬鐝粍-id闆嗗悎")
--
Gitblit v1.9.3