From 7e2382e701604e97f775dca55dc00cee7c5da053 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 09 八月 2024 08:02:16 +0800
Subject: [PATCH] 电磁锁异常停车加入临时电子围栏提交
---
ard-work/src/main/java/com/ruoyi/call/controller/ArdCallGroupController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/call/controller/ArdCallGroupController.java b/ard-work/src/main/java/com/ruoyi/call/controller/ArdCallGroupController.java
index 7a9e641..20d9e74 100644
--- a/ard-work/src/main/java/com/ruoyi/call/controller/ArdCallGroupController.java
+++ b/ard-work/src/main/java/com/ruoyi/call/controller/ArdCallGroupController.java
@@ -4,7 +4,9 @@
import javax.servlet.http.HttpServletResponse;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.ruoyi.call.service.IArdCallGroupUserService;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,7 +41,8 @@
public class ArdCallGroupController extends BaseController {
@Autowired
private IArdCallGroupService ardCallGroupService;
-
+ @Autowired
+ private IArdCallGroupUserService ardCallGroupUserService;
/**
* 鏌ヨ缇ょ粍鍒楄〃
*/
@@ -49,6 +52,10 @@
public TableDataInfo list(ArdCallGroup ardCallGroup) {
startPage();
List<ArdCallGroup> list = ardCallGroupService.selectArdCallGroupList(ardCallGroup);
+ list.stream().forEach(ardCallGroup1 -> {
+ List<SysUser> userList = ardCallGroupUserService.InGroupUsers(ardCallGroup1.getId());
+ ardCallGroup1.setSysUserList(userList);
+ });
return getDataTable(list);
}
@@ -59,7 +66,13 @@
@ApiOperation("鑾峰彇缇ょ粍璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
- return success(ardCallGroupService.selectArdCallGroupById(id));
+ ArdCallGroup ardCallGroup = ardCallGroupService.selectArdCallGroupById(id);
+ if(ardCallGroup!=null)
+ {
+ List<SysUser> userList = ardCallGroupUserService.InGroupUsers(ardCallGroup.getId());
+ ardCallGroup.setSysUserList(userList);
+ }
+ return success(ardCallGroup);
}
/**
--
Gitblit v1.9.3