From 0a7d5b0104dc71b213dfc7efbaa8ff39a6f61f3f Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期四, 10 四月 2025 15:38:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 4 ++--
aps-modules/aps-system/src/main/resources/mapper/system/SysMenuMapper.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
index d9253c9..6d2a4ae 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -197,8 +197,8 @@
* @Author: wwj
* @Date: 2025/4/9
*/
- @GetMapping("/confirmPart")
- public AjaxResult confirmPart(ApsPartPlanTemp apsPartPlanTemp) {
+ @PostMapping("/confirmPart")
+ public AjaxResult confirmPart(@RequestBody ApsPartPlanTemp apsPartPlanTemp) {
return toAjax(apsPartPlanService.confirmPart(apsPartPlanTemp));
}
diff --git a/aps-modules/aps-system/src/main/resources/mapper/system/SysMenuMapper.xml b/aps-modules/aps-system/src/main/resources/mapper/system/SysMenuMapper.xml
index ee7c555..4abe231 100644
--- a/aps-modules/aps-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/aps-modules/aps-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -81,7 +81,7 @@
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
+ where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = '0' AND ro.status = '0'
order by m.parent_id, m.order_num
</select>
--
Gitblit v1.9.3