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/PatrolConfController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
index 8444397..f010a48 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/PatrolConfController.java
@@ -2,10 +2,12 @@
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.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ShiroUtils;
@@ -29,11 +31,14 @@
@Resource
private PatrolConfManager patrolConfManager;
+ @Resource
+ private CommonManager commonManager;
+
/**
* 宸℃洿閰嶇疆椤甸潰
*/
@GetMapping()
- public String patrolConf() {
+ public String patrolConf(ModelMap mmap) {
return prefix + "/patrolConf";
}
@@ -71,6 +76,8 @@
*/
@GetMapping("/add")
public String add(ModelMap mmap) {
+ //宸￠�讳汉鍒楄〃
+ mmap.put("userList", commonManager.listUserData());
return prefix + "/add";
}
@@ -86,8 +93,8 @@
}
param.setCreateBy(getLoginName());
param.setCreateTime(new Date());
- if (StringUtils.isEmpty(param.getBatchId())) {
- param.setBatchId(ContextUtil.generateId());
+ if (StringUtils.isEmpty(param.getId())) {
+ param.setId(ContextUtil.generateId());
}
return toAjax(patrolConfManager.insertData(param));
}
@@ -99,6 +106,8 @@
public String edit(@PathVariable("id") String id, ModelMap mmap) {
PatrolConf record = patrolConfManager.selectById(id);
mmap.put("patrolConf", record);
+ //宸￠�讳汉鍒楄〃
+ mmap.put("userList", commonManager.listUserData());
return prefix + "/edit";
}
@@ -114,9 +123,9 @@
}
param.setUpdateBy(getLoginName());
param.setUpdateTime(new Date());
- PatrolConf patrolConf = patrolConfManager.selectById(param.getBatchId());
+ PatrolConf patrolConf = patrolConfManager.selectById(param.getId());
if (patrolConf == null) {
- param.setBatchId(ContextUtil.generateId());
+ param.setId(ContextUtil.generateId());
return toAjax(patrolConfManager.insertData(param));
}
@@ -130,7 +139,7 @@
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
- patrolConfManager.deleteDataById( ids);
+ patrolConfManager.deleteDataById(ids);
return success();
}
}
--
Gitblit v1.9.3