From b9686c7739bf131922005e86128ba9232c0313ac Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期二, 17 十二月 2024 17:55:56 +0800
Subject: [PATCH] 图标管理
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
index e51a69d..6d3928c 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
@@ -959,7 +959,7 @@
tree.setOid(cbo.oid);
tree.setText(cbo.id + " " + cbo.name);
Map<String,String> attributeMap = new HashMap<>();
- WebUtil.copyValueToCboFromMap(cbo,attributeMap);
+ WebUtil.copyValueToMapFromBos(cbo,attributeMap);
tree.setAttributes(attributeMap);
tree.setLeaf(true);
treeList.add(tree);
@@ -1141,19 +1141,21 @@
if(StringUtils.isBlank(md5Password) || StringUtils.isBlank(userName)){
return false;
}
- String sql = " select plpassword from pluser where plusername = :userName";
+ /*String sql = " select plpassword from pluser where plusername = :userName";
Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("userName",userName.trim());
- List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
- if(CollectionUtils.isEmpty(BusinessObjectList)){
+ conditionMap.put("userName",userName.trim());*/
+ SmUserVO userVO = this.getUserByUserId(userName);
+ //List<BusinessObject> BusinessObjectList = boService.queryBySql(sql, conditionMap);
+ if(Func.isEmpty(userVO) || Func.isBlank(userVO.getOid())){
return false;
}
- ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
- des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
+ //ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
+ //des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
//瀵规煡璇㈠嚭鏉ョ殑瀵嗙爜瑙ｅ瘑
- String plpassword = ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0), "plpassword");
- plpassword = des.getDesString(plpassword);
+ //String plpassword = ObjectTool.getNewBOAttributeValue(BusinessObjectList.get(0), "plpassword");
+ String plpassword = userVO.getPassword();
+ //plpassword = des.getDesString(plpassword);
if(md5Password.equals(plpassword)){
return true;
}
@@ -1671,9 +1673,9 @@
* @throws VciBaseException
*/
@Override
- public List<SmUserVO> listUserByUserType() throws PLException {
+ public List<SmUserVO> listUserByUserType(Integer type) throws PLException {
try {
- UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
+ UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(type != null ? type.shortValue() :Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
return userInfoArr2VO(userInfo);
} catch (PLException e) {
throw new VciBaseException("鐧诲綍鏃讹紝鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛�"+e.getMessage());
--
Gitblit v1.9.3