From 2f8555410f031e66ee91ee60f64d1cc9a34cc7d9 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@vci-tech.com>
Date: 星期三, 25 十二月 2024 17:44:38 +0800
Subject: [PATCH] 1、首页配置 2、调整BaseModelDTO的位置
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 5d8ea22..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;
}
@@ -1456,7 +1458,7 @@
userInfo.updateUser = user.getLastModifier() == null ? "" : user.getLastModifier();
userInfo.pwdUpdateTime = user.getPwdUpdateTime().getTime();
userInfo.grantor = user.getGrantor() == null ? "" : user.getGrantor();
- userInfo.secretGrade = user.getSecretGrade() == null ? 2 : Integer.valueOf(user.getGrantor());
+ userInfo.secretGrade = user.getSecretGrade() == null ? 2 : Integer.valueOf(user.getSecretGrade());
userInfo.isDeptLeader = user.getIsDeptLeader() == null ? "0" : user.getIsDeptLeader();
return userInfo;
}
--
Gitblit v1.9.3