From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 27 十月 2023 10:37:49 +0800
Subject: [PATCH] bug修改：148（历史数据导入报错，当前分类没有设置编码规则，未找父级的编码规则的bug）；150（主数据新增时未先找当前层级的编码规则，再向上查找的bug）

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java
index 245038e..69697f8 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java
@@ -53,6 +53,8 @@
 		userVO.setPostName(Func.join(postName));
 		userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
 		userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
+		userVO.setUserStatus(user.getUserStatus());
+		userVO.setUserStatusText(DictCache.getValue(DictEnum.USER_STATUS,user.getUserStatus()));//鐢ㄦ埛鐘舵��
 		return userVO;
 	}
 

--
Gitblit v1.9.3