From d87906519f8d9599961e7908ea775e9c74256219 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 16 八月 2024 16:42:17 +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 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 6ff9209..c11a566 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
@@ -50,7 +50,7 @@
* @return 鐢ㄦ埛瀹炰綋
*/
public BaUser selectById(Long id) {
- return this.dao.selectById(id);
+ return this.dao.selectByPrimaryKey(id);
}
/**
@@ -76,7 +76,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<>());
@@ -113,8 +113,10 @@
* @return 褰卞搷璁板綍鏁伴噺
*/
@Transactional
- public int save(BaUser po){
- return this.dao.putin(po) ;
+ public Long save(BaUser po){
+ //return this.dao.putin(po) ;
+ this.dao.putin(po) ;
+ return po.getId();
}
/**
@@ -164,14 +166,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;
}
/**
@@ -218,7 +221,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());
--
Gitblit v1.8.0