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 | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 9dce98e..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);
}
/**
@@ -76,7 +77,7 @@
if(list_users.size() > 0) {
for(int i = 0; i < list_users.size(); i++) {
VoUserInfo voUserInfo = list_users.get(i);
- String userId = voUserInfo.getUserId();
+ String userId = voUserInfo.getId();
JSONArray array_roleIds = new JSONArray();
List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
@@ -116,7 +117,7 @@
public Long save(BaUser po){
//return this.dao.putin(po) ;
this.dao.putin(po) ;
- return po.getUserId();
+ return po.getId();
}
/**
@@ -166,14 +167,15 @@
* @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
*/
public int setRoles(Long userId, String[] roleIds) {
- this.urDao.deleteByUserId(userId);
+
int count = 0;
if (roleIds != null && roleIds.length > 0) {
+ this.urDao.deleteByUserId(userId);
for (String roleId : roleIds) {
count += this.urDao.insertSelective(new BaUserRole(userId, Long.parseLong(roleId)));
}
}
- return count;
+ return 1;
}
/**
@@ -220,7 +222,7 @@
if(map.size() == 0) {
return null;
}
- voUserInfo.setUserId(String.valueOf(userId));
+ voUserInfo.setId(String.valueOf(userId));
voUserInfo.setUserName(map.get("userName").toString());
voUserInfo.setPhone(map.get("phone").toString());
voUserInfo.setBlockId(map.get("blockId").toString());
@@ -256,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