From 00d54db361d697cf8fdf2f15940f4650b21b3185 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 21 四月 2025 15:05:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index 064851b..e47e787 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -11,6 +11,7 @@
import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import com.dy.pipIrrGlobal.pojoBa.BaUserRole;
+import com.dy.pipIrrGlobal.voBa.VoSimpleUser;
import com.dy.pipIrrGlobal.voBa.VoUserInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -50,7 +51,7 @@
* @return 鐢ㄦ埛瀹炰綋
*/
public BaUser selectById(Long id) {
- return this.dao.selectById(id);
+ return this.dao.selectByPrimaryKey(id);
}
/**
@@ -257,8 +258,15 @@
voUserInfo.setRoleIds(list_roleIds);
voUserInfo.setRoleNames(list_roleNames);
voUserInfo.setPermissions(array_permission);
-
-
return voUserInfo;
}
+
+ /**
+ * 鑾峰彇绠�鍗曠敤鎴锋暟鎹垪琛紝鏁版嵁鍒楄〃鏌ヨ鏉′欢涓娇鐢�
+ * @return
+ */
+ public List<VoSimpleUser> getSimpleUsers() {
+ return dao.getSimpleUsers();
+ }
+
}
--
Gitblit v1.8.0