rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 优化显示

This commit is contained in:
曹鹏飞 2025-06-24 09:48:54 +08:00
parent 07203f095c
commit f7a0ed6821
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -646,6 +646,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.throwMessage("随机码不正确"); .throwMessage("随机码不正确");
appUser.setState(UserState.Activated.getState()); appUser.setState(UserState.Activated.getState());
appUser.setPassword(PASSWORDENCODER.encode(request.getPassword())); appUser.setPassword(PASSWORDENCODER.encode(request.getPassword()));
appUser.setUpdateBy(AppUserUtil.getUserName());
appUser.setUpdateTime(LocalDateTime.now()); appUser.setUpdateTime(LocalDateTime.now());
updateById(appUser); updateById(appUser);
}else if (StrUtil.equals("1", type)){ }else if (StrUtil.equals("1", type)){

3
nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
View File

@ -91,13 +91,14 @@
UNION 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' 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' ,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' ,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' ,false AS 'isPrimary',0 AS 'state',u.language_code AS 'languageCode'
FROM app_user_applyfor u FROM app_user_applyfor u
INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN t_base_customer c ON u.company_id=c.id
INNER JOIN app_area a ON u.area_id=a.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 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} WHERE u.state=0 AND u.company_id=#{companyId}
<if test="state > 0"> <if test="state > 0">
AND 1=2 AND 1=2