From e4eec9fc65f1d63f06606a15f0ce518d4fe023fd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 二月 2023 14:10:32 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java | 7 +++++++
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 2 +-
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java | 1 +
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index 80434cf..3b7cc17 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -65,7 +65,7 @@
INNER JOIN `ums_role_menu_relation` AS rmr on rmr.role_id = arr.role_id
JOIN ums_menu AS m ON rmr.menu_id = m.id
WHERE arr.admin_id = #{id}
- order by m.id
+ order by m.sort
</select>
</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
index c30a663..803082d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
@@ -72,6 +72,7 @@
@DeleteMapping("/batch_delete")
@LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolations(@RequestParam String[] ids) {
+
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
index 9867d6a..cba4e8d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
+import java.util.Arrays;
/**
* <p>
@@ -86,7 +87,13 @@
teamConstruction.setId(id);
return CommonResult.success(iTeamConstructionService.updateById(teamConstruction));
}
+ @ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
+ @DeleteMapping("/batch_delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
+ public CommonResult removeViolations(@RequestParam Long[] ids) {
+ return CommonResult.success(iTeamConstructionService.removeBatchByIds(Arrays.asList(ids)));
+ }
@PostMapping("/export")
@ApiOperation("瀵煎嚭")
@LogSave(operationType = "闃熶紞寤鸿绠＄悊", contain = "瀵煎嚭")
--
Gitblit v1.8.0