From 651186d7fce51274500b66d7ed8a53bedc6a1339 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 12:47:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
index 0e1b1c7..7dc55ef 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
@@ -1,6 +1,9 @@
package com.ruoyi.sy.service;
import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.sy.domain.ArdSyUser;
/**
@@ -26,6 +29,7 @@
* @return 涓変竴杞﹁締鐢ㄦ埛闆嗗悎
*/
public List<ArdSyUser> selectArdSyUserList(ArdSyUser ardSyUser);
+ public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser);
/**
* 鏂板涓変竴杞﹁締鐢ㄦ埛
@@ -58,4 +62,24 @@
* @return 缁撴灉
*/
public int deleteArdSyUserById(String id);
+
+ /**
+ * 鏌ヨ涓変竴杞﹁締鐢ㄦ埛淇℃伅
+ *
+ */
+ public List<ArdSyUser> getArdSyUserAll();
+
+ /**
+ * 鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛
+ */
+ public List<SysUser> getSysUserNoSY();
+
+ Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
+
+ ArdSyUser userById(String id);
+
+ /**
+ * 鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締璐﹀彿瀵嗙爜
+ */
+ public List<ArdSyUser> selectSyUser();
}
--
Gitblit v1.9.3