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 | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 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 4708b90..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);
}
/**
@@ -62,19 +63,8 @@
Long itemTotal = this.dao.getRecordCount(params);
QueryResultVo<List<VoUserInfo>> rsVo = new QueryResultVo<>() ;
-
- Integer pageCurr = 0;
- Integer pageSize = 10000;
- rsVo.pageCurr = 1;
- rsVo.pageSize = 10000;
- if(queryVo.pageSize != null && queryVo.pageCurr != null) {
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr;
- pageSize = queryVo.pageSize ;
- pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
- }
- params.put("pageCurr", pageCurr);
- params.put("pageSize", pageSize);
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
@@ -87,10 +77,10 @@
if(list_users.size() > 0) {
for(int i = 0; i < list_users.size(); i++) {
VoUserInfo voUserInfo = list_users.get(i);
- Long userId = voUserInfo.getUserId();
+ String userId = voUserInfo.getId();
JSONArray array_roleIds = new JSONArray();
- List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(userId)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
for (int j = 0; j < list_roleIds.size(); j++) {
Map map_roleId = list_roleIds.get(j);
if(map_roleId != null) {
@@ -101,7 +91,7 @@
List<Map<String, Object>> list_roleId = (List<Map<String, Object>>) JSON.parse(array_roleIds.toJSONString());
JSONArray array_roleNames = new JSONArray();
- List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(userId)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list_roleNames = Optional.ofNullable(this.dao.getRoleNamesByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
for (int j = 0; j < list_roleNames.size(); j++) {
Map map_roleName = list_roleNames.get(j);
if(map_roleName != null) {
@@ -124,8 +114,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();
}
/**
@@ -175,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;
}
/**
@@ -226,10 +219,14 @@
VoUserInfo voUserInfo = new VoUserInfo();
JSONArray array_permission = new JSONArray();
Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
- if(map.size() > 0) {
- voUserInfo.setUserId(userId);
- voUserInfo.setUserName(map.get("userName").toString());
+ if(map.size() == 0) {
+ return null;
}
+ voUserInfo.setId(String.valueOf(userId));
+ voUserInfo.setUserName(map.get("userName").toString());
+ voUserInfo.setPhone(map.get("phone").toString());
+ voUserInfo.setBlockId(map.get("blockId").toString());
+ voUserInfo.setBlockName(map.get("blockName").toString());
/**
* 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
@@ -261,7 +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