From 6b268e3e7ee7e71d4dcb7760b005242679a1608f Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 一月 2024 15:23:55 +0800
Subject: [PATCH] 2024-01-25 朱宝民 优化获取用户信息接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 3 +++
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 3 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java | 7 ++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 16 ++++++++++------
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 11 ++++++++---
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index d0a9b56..00deab6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -245,14 +245,18 @@
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
<select id="getUserInfoById" resultType="java.util.Map">
SELECT
- id AS userId,
- name AS userName
- FROM ba_user
+ us.id AS userId,
+ us.name AS userName,
+ us.phone,
+ IFNULL(us.blockId, 0) AS blockId,
+ IFNULL(blo.name, 0) AS blockName
+ FROM ba_user us
+ LEFT JOIN ba_block blo ON us.blockId = blo.id
<where>
- AND disabled = 0
- AND deleted = 0
+ AND us.disabled = 0
+ AND us.deleted = 0
<if test = "userId != null and userId > 0">
- AND ba_user.id = ${userId}
+ AND us.id = ${userId}
</if>
</where>
</select>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java
index 94bbe67..b757745 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java
@@ -22,7 +22,12 @@
NO_ROLES(10004, "娌℃湁绗﹀悎鏉′欢鐨勮鑹茶褰�"),
PLEASE_INPUT_ROLE_ID(10005, "瑙掕壊缂栧彿涓嶈兘涓虹┖"),
DELETE_ROLE_FAIL(10006, "鍒犻櫎瑙掕壊澶辫触"),
- USER_NOT_EXIST(10007, "鍒犻櫎鐨勭敤鎴蜂笉瀛樺湪");
+ USER_NOT_EXIST(10007, "鍒犻櫎鐨勭敤鎴蜂笉瀛樺湪"),
+
+ /**
+ * 鐢ㄦ埛
+ */
+ THE_USER_NOT_EXIST(20001, "鐢ㄦ埛涓嶅瓨鍦�");
private final Integer code;
private final String message;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index e552d73..9d58bd9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -495,6 +495,9 @@
public BaseResponse<QueryResultVo<VoUserInfo>> getUserInfos(@PathVariable("userId") Long userId) {
try {
VoUserInfo res = this.sv.getUserInfos(userId);
+ if(res == null) {
+ return BaseResponseUtils.buildException(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+ }
System.out.println(" :" + res);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
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 afe4e62..1c2ebd3 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
@@ -226,10 +226,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(String.valueOf(userId));
- voUserInfo.setUserName(map.get("userName").toString());
+ if(map.size() == 0) {
+ return null;
}
+ voUserInfo.setUserId(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());
/**
* 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
@@ -262,6 +266,7 @@
voUserInfo.setRoleNames(list_roleNames);
voUserInfo.setPermissions(array_permission);
+
return voUserInfo;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
index ed8e8be..66ac3e0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java
@@ -115,7 +115,8 @@
* @return 淇敼璁板綍鏉℃暟
*/
public Integer updateByPrimaryKey(PrDivide po) {
- return prDivideMapper.updateByPrimaryKey(po);
+ //return prDivideMapper.updateByPrimaryKey(po);
+ return prDivideMapper.updateByPrimaryKeySelective(po);
}
/**
--
Gitblit v1.8.0