From 0d8bc39af6d630470d9bc7b79fe53d31b5ad887a Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 23 Jul 2026 10:12:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yfd/platform/config/SwaggerConfig.java  | 8 ++++++++
 .../qgc_base/service/impl/MsWarnRuleBServiceImpl.java     | 3 +--
 .../warnRule/controller/MsWarnRuleBController.java        | 2 ++
 .../yfd/platform/system/controller/SysMenuController.java | 6 ++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java
index c28488e1..00088d47 100644
--- a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java
+++ b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java
@@ -265,6 +265,14 @@ public class SwaggerConfig {
                 .build();
     }
 
+    @Bean
+    public GroupedOpenApi groupWarnRuleApi() {
+        return GroupedOpenApi.builder()
+                .group("5.5 预警规则")
+                .packagesToScan("com.yfd.platform.qgc_sys.warnRule.controller")
+                .build();
+    }
+
 
     @Bean
     public GroupedOpenApi groupLygkApi() {
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
index b86dd078..6f4fd70d 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java
@@ -107,12 +107,11 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
                 "FROM MS_WARN_RULE_B t1\n" +
                 "INNER JOIN MS_WARN_RULE_DETAIL_B t2 ON t1.ID = t2.RULE_ID\n" +
                 "INNER JOIN ST_YS_B t3 ON t2.YS = t3.YS\n" +
-                "WHERE t1.RULE_TYPE = #{ruleType}\n" +
+                "WHERE t1.RULE_TYPE ="+dbRuleType+"\n" +
                 "  AND t1.IS_DELETED = 0\n" +
                 "  AND t2.IS_DELETED = 0\n" +
                 "GROUP BY t2.TB_ID, t2.YS, t3.YS_SHOW_NAME";
         Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("ruleType", dbRuleType);
         return microservicDynamicSQLMapper.getAllListWithResultType(sql, paramMap, WarnYsVo.class);
     }
 
diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java
index 8ce549d4..c1c516c7 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java
@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/sys/warnRule")
 @Tag(name = "告警规则配置管理")
+@Controller("msWarnRuleBControllerSys")
 public class MsWarnRuleBController {
 
     @Resource
diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java b/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java
index dea76c02..bb4f90c6 100644
--- a/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java
+++ b/backend/src/main/java/com/yfd/platform/system/controller/SysMenuController.java
@@ -149,6 +149,9 @@ public class SysMenuController {
     public ResponseResult addMenu(@RequestBody SysMenu sysMenu,
                                   @RequestHeader(value = "Tenant_id", required = false) String tenantId) {
         sysMenu.setTenantId(StrUtil.trimToNull(tenantId));
+        if(StrUtil.isBlank(sysMenu.getTenantId())){
+            sysMenu.setTenantId(sysMenu.getSystemcode());
+        }
         boolean isOk = sysMenuService.addMenu(sysMenu);
         if (isOk) {
             return ResponseResult.success();
@@ -176,6 +179,9 @@ public class SysMenuController {
             return ResponseResult.error("未找到对应租户的菜单");
         }
         sysMenu.setTenantId(StrUtil.trimToNull(tenantId));
+        if(StrUtil.isBlank(sysMenu.getTenantId())){
+            sysMenu.setTenantId(sysMenu.getSystemcode());
+        }
         sysMenu.setLastmodifier(userService.getUsername());
         sysMenu.setLastmodifydate(new Timestamp(System.currentTimeMillis()));
         boolean isOk = sysMenuService.updateById(sysMenu);