From 16d791ca2ed4a6df1724a351dbb55133dde3805f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 24 Jun 2025 09:48:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/service/impl/AppUserServiceImpl.java | 1 + .../src/main/resources/mapper/AppUserMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index e8e51adc..2b1771cf 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -646,6 +646,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .throwMessage("随机码不正确"); appUser.setState(UserState.Activated.getState()); appUser.setPassword(PASSWORDENCODER.encode(request.getPassword())); + appUser.setUpdateBy(AppUserUtil.getUserName()); appUser.setUpdateTime(LocalDateTime.now()); updateById(appUser); }else if (StrUtil.equals("1", type)){ diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml index fcfc215b..87989ed1 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml @@ -91,13 +91,14 @@ UNION SELECT u.id,u.user_phone AS 'phone',0 AS 'userState',u.title_id AS 'titleId',u.area_id AS 'areaId',u.company_id AS 'companyId' ,p.position_name AS 'title',null AS 'expireTime',c.agency_company_name AS 'companyName',u.user_email AS 'loginName' - ,u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar',a.`name` AS 'areaName',u.create_by AS 'createBy' + ,u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar',a.`name` AS 'areaName',cau.name AS 'createBy' ,u.create_time AS 'createTime',u.update_by AS 'updateBy',null AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime' ,false AS 'isPrimary',0 AS 'state',u.language_code AS 'languageCode' FROM app_user_applyfor u INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN app_area a ON u.area_id=a.id LEFT JOIN t_base_position p ON u.title_id=p.id + LEFT JOIN app_user cau ON u.create_by=cau.id WHERE u.state=0 AND u.company_id=#{companyId} AND 1=2