From db13f13c39508acdb0c4a88cbf51c930fb2fba16 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 十一月 2024 10:10:17 +0800
Subject: [PATCH] 管理员添加用户之后设置用户密码修改时间为0

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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 85f2a32..df14674 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
@@ -1,8 +1,9 @@
 package com.vci.frameworkcore.compatibility.impl;
 
-import com.vci.client.common.providers.ClientServiceProvider;
+import com.vci.common.utility.ObjectUtility;
 import com.vci.corba.framework.data.DeptInfo;
 import com.vci.corba.framework.data.RoleInfo;
+import com.vci.corba.framework.data.UserLogonInfo;
 import com.vci.corba.omd.etm.EnumItem;
 import com.vci.corba.omd.etm.EnumType;
 import com.vci.dto.SmUserDTO;
@@ -42,7 +43,6 @@
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -387,11 +387,8 @@
 		smUserVO.setIsDeptLeader(userInfo.isDeptLeader.equals("0") ? "涓嶆槸":"鏄�");
 		//涓撲笟
 		smUserVO.setSpecialties(userInfo.specialties);
-		if(userInfo.status == 0){
-			smUserVO.setLockFlag(false);
-		}else{
-			smUserVO.setLockFlag(true);
-		}
+		UserLogonInfo lockObj = platformClientUtil.getFrameworkService().fetchUserLogonObj(userInfo.id);
+		smUserVO.setLockFlag(lockObj.plWrongNum == 0);
 		smUserVO.setCreator(userInfo.createUser);
 		smUserVO.setCreateTime(VciDateUtil.long2Date(userInfo.createTime));
 		smUserVO.setLastModifier(userInfo.updateUser);
@@ -1319,7 +1316,10 @@
 		}
 		smUserDTO.setCreator(loginUserId);
 		smUserDTO.setLastModifier(loginUserId);
+		smUserDTO.setOid(ObjectUtility.getNewObjectID36());
 		UserInfo userInfo = changeSmUserDTOToUserInfo(smUserDTO);
+		//绠$悊鍛樻坊鍔犵殑鐢ㄦ埛鍒濆瀵嗙爜淇敼鏃堕棿閮藉簲璇ヤ负0锛屽洜涓烘秹鍙婂埌鍚庨潰鐢ㄦ埛棣栨鐧诲綍鑷繁淇敼瀵嗙爜
+		userInfo.pwdUpdateTime = 0;
 		UserEntityInfo userEntityInfo = new UserEntityInfo(loginUserId, "");
 		String oid = platformClientUtil.getFrameworkService().saveUser(userInfo, userEntityInfo);
 		if (Func.isEmpty(oid)) {
@@ -1454,6 +1454,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.isDeptLeader = user.getIsDeptLeader() == null ? "0" : user.getIsDeptLeader();
 		return userInfo;
 	}

--
Gitblit v1.9.3