From d49fdf513a42126f64e49303a5d36ba111b5949e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 29 Apr 2022 15:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/OperUserController.java | 3 ++-
 .../main/java/com/epmet/service/impl/OperUserServiceImpl.java  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java
index e20d047808..02d15a0b46 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java
@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -94,7 +95,7 @@ public class OperUserController {
 	 */
 	@PostMapping(value = "updatePwd")
 	public Result updatePwd(@LoginUser TokenDto tokenDto,@RequestBody PasswordDTO dto) {
-		if (StringUtils.isBlank(dto.getNewPassword())){
+		if (StringUtils.isBlank(dto.getNewPassword()) && AppClientConstant.APP_OPER.equals(tokenDto.getClient())){
 			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
 		}
 		operUserService.updatePwd(tokenDto.getUserId(),dto);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
index f5c37265b0..f3dddd6a59 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
@@ -148,7 +148,6 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     @Override
     public void updatePwd(String userId, PasswordDTO dto) {
         OperUserEntity param = new OperUserEntity();
-        param.setUserId(userId);
         param.setPassword(PasswordUtils.encode(dto.getNewPassword()));
         param.setUpdatedTime(new Date());
         param.setUpdatedBy(userId);