From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
index b794068..52e6795 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolController.java
@@ -1,7 +1,10 @@
package com.fzzy.sys.controller.security;
import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.sys.manager.common.CommonManager;
+import com.fzzy.sys.manager.security.PatrolConfManager;
import com.fzzy.sys.manager.security.PatrolManager;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -29,6 +32,12 @@
@Resource
private PatrolManager patrolManager;
+ @Resource
+ private PatrolConfManager patrolConfManager;
+
+
+ @Resource
+ private CommonManager commonManager;
/**
* 鐢靛瓙宸℃洿椤甸潰
*
@@ -36,7 +45,9 @@
* @date 2025/12/06
*/
@GetMapping()
- public String patrol() {
+ public String patrol(ModelMap mmap) {
+ //鑾峰彇搴撳尯鍥炴樉鍒楄〃
+ mmap.put("deptList", commonManager.listDeptData());
return prefix + "/patrol";
}
--
Gitblit v1.9.3