From 8c15564b476b9abbfb1ca7fbf6b843e8af64accb Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期日, 25 六月 2023 17:28:47 +0800
Subject: [PATCH] 三一用户查询新增系统用户提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
index 526a75c..85bcd0c 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.sy.controller;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -45,10 +46,13 @@
*/
@PreAuthorize("@ss.hasPermi('sy:syUser:list')")
@GetMapping("/list")
+ @ApiOperation("鏌ヨ涓変竴杞﹁締鎸傛帴鐢ㄦ埛")
public TableDataInfo list(ArdSyUser ardSyUser)
{
startPage();
- List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
+ /*List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
+ return getDataTable(list);*/
+ List<Map<String,Object>> list = ardSyUserService.selectArdSyUserListWithSysUser(ardSyUser);
return getDataTable(list);
}
--
Gitblit v1.9.3