From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 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 1b5d344..bc6b3e2 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
@@ -49,6 +49,7 @@
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -1387,19 +1388,32 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateUser(SmUserDTO smUserDTO) throws PLException {
- //鍒ょ┖
- VciBaseUtil.alertNotNull(
- smUserDTO,"淇敼鐨勭敤鎴峰璞�",
- smUserDTO.getOid(),"鐢ㄦ埛涓婚敭",
- smUserDTO.getId(),"鐢ㄦ埛鍚�",
- smUserDTO.getPassword(),"瀵嗙爜",
- smUserDTO.getConfirmPassword(),"纭瀵嗙爜",
- smUserDTO.getName(),"濮撳悕"
- );
- //鏍￠獙
- check(smUserDTO,false,false);
- //鏌ヨ鏁版嵁搴撲腑鐨�
- SmUserVO dbSmUserVO = getUserByUserOid(smUserDTO.getOid());
+ SmUserVO dbSmUserVO;
+ if(StringUtils.isBlank(smUserDTO.getId()) && StringUtils.isNotBlank(smUserDTO.getOid())
+ && StringUtils.isNotBlank(smUserDTO.getName())){
+
+ //鏌ヨ鏁版嵁搴撲腑鐨�
+ dbSmUserVO = getUserByUserOid(smUserDTO.getOid());
+ dbSmUserVO.setName(smUserDTO.getName());
+ dbSmUserVO.setEmail(smUserDTO.getEmail());
+ BeanUtils.copyProperties(dbSmUserVO,smUserDTO);
+ //鏍￠獙
+ check(smUserDTO,false,false);
+ }else{
+ //鍒ょ┖
+ VciBaseUtil.alertNotNull(
+ smUserDTO,"淇敼鐨勭敤鎴峰璞�",
+ smUserDTO.getOid(),"鐢ㄦ埛涓婚敭",
+ smUserDTO.getId(),"鐢ㄦ埛鍚�",
+ smUserDTO.getPassword(),"瀵嗙爜",
+ smUserDTO.getConfirmPassword(),"纭瀵嗙爜",
+ smUserDTO.getName(),"濮撳悕"
+ );
+ //鏍￠獙
+ check(smUserDTO,false,false);
+ //鏌ヨ鏁版嵁搴撲腑鐨�
+ dbSmUserVO = getUserByUserOid(smUserDTO.getOid());
+ }
//鏍规嵁涓婚敭娌℃煡璇㈠埌浜嗙敤鎴�
if(Func.isEmpty(dbSmUserVO) || Func.isBlank(dbSmUserVO.getOid())){
throw new PLException("500", new String[] { "褰撳墠淇敼鐨勭敤鎴蜂笉瀛樺湪"});
--
Gitblit v1.9.3