From cdba4febf23c6f55346a474579361923aacf0bc9 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 02 十二月 2024 14:54:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index 8c2133d..6b9efb7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -388,7 +388,7 @@
//涓撲笟
smUserVO.setSpecialties(userInfo.specialties);
UserLogonInfo lockObj = platformClientUtil.getFrameworkService().fetchUserLogonObj(userInfo.id);
- smUserVO.setLockFlag(lockObj.plWrongNum == 0);
+ smUserVO.setLockFlag(lockObj.plWrongNum != 0);
smUserVO.setCreator(userInfo.createUser);
smUserVO.setCreateTime(VciDateUtil.long2Date(userInfo.createTime));
smUserVO.setLastModifier(userInfo.updateUser);
@@ -1664,4 +1664,19 @@
return userNameList;
}
+ /**
+ * 浣跨敤褰撳墠鐢ㄦ埛鐨勭被鍨嬫煡璇㈢敤鎴�
+ * @return
+ * @throws VciBaseException
+ */
+ @Override
+ public List<SmUserVO> listUserByUserType() throws PLException {
+ try {
+ UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
+ return userInfoArr2VO(userInfo);
+ } catch (PLException e) {
+ throw new VciBaseException("鐧诲綍鏃讹紝鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛�"+e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3