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

fix: 修复一些问题

This commit is contained in:
曹鹏飞 2025-01-26 22:40:03 +08:00
parent f4dace2cc3
commit f58d39ff5e
8 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AdminController.java
View File

@ -36,9 +36,9 @@ public class AdminController {
public ApiResult<SaTokenInfo> login(String userName, String password) {
AdminUser user=adminUserService.getUser(userName,password);
VUtils.trueThrow(Objects.isNull(user)).throwMessage(STATE.PassportErr,"用户名或密码错误");
VUtils.trueThrow(user.getState()==-1).throwMessage(STATE.PassportErr,"用户被冻结，请联系管理员");
VUtils.trueThrow(!user.getEnable()).throwMessage(STATE.PassportErr, "用户被禁用，请联系管理员");
SaTokenAdminUtil.login(user.getId(), SaLoginConfig
.setExtra("name", user.getName()));
.setExtra("name", user.getUserName()));
return ApiResult.success(SaTokenAdminUtil.getTokenInfo());
}

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ConfigUpdateRequest.java
View File

@ -1,7 +1,9 @@
package com.nflg.mobilebroken.common.pojo.request;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
@Data
public class ConfigUpdateRequest extends ConfigAddRequest {

2
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchMenuButtonRequest.java
View File

@ -1,7 +1,9 @@
package com.nflg.mobilebroken.common.pojo.request;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
@Data
public class SearchMenuButtonRequest extends PageRequest {

1
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java
View File

@ -8,6 +8,7 @@ import lombok.Setter;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>

10
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBasePositionMapper.java
View File

@ -1,6 +1,12 @@
package com.nflg.mobilebroken.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
import com.nflg.mobilebroken.repository.entity.TBasePosition;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@ -13,7 +19,7 @@ import com.nflg.mobilebroken.repository.entity.TBasePosition;
public interface TBasePositionMapper extends BaseMapper<TBasePosition> {
Page<TBasePosition> getList(@Param("page")Page<PageBaseQuery> page,@Param("query") PageBaseQuery query);
Page<TBasePosition> getList(@Param("page") Page<PageBaseQuery> page, @Param("query") PageBaseQuery query);
void delByIds(@Param("ids")List<Integer> ids);
void delByIds(@Param("ids") List<Integer> ids);
}

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
View File

@ -25,7 +25,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
public AdminUser getUser(String userName, String password) {
String encodePassword= PASSWORDENCODER.encode(password);
return lambdaQuery()
.eq(AdminUser::getCode, userName)
.eq(AdminUser::getLoginName, userName)
.eq(AdminUser::getPassword, encodePassword)
.one();
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ParamConfigServiceImpl.java
View File

@ -77,7 +77,7 @@ public class ParamConfigServiceImpl extends ServiceImpl<ParamConfigMapper, Param
if (Objects.isNull(createUserName)) {
AdminUser au = adminUserService.getById(d.getCreateBy());
if (Objects.nonNull(au)) {
createUserName = au.getName();
createUserName = au.getUserName();
userMap.put(d.getCreateBy(), createUserName);
}
}
@ -85,7 +85,7 @@ public class ParamConfigServiceImpl extends ServiceImpl<ParamConfigMapper, Param
if (Objects.isNull(updateUserName)) {
AdminUser au = adminUserService.getById(d.getUpdateBy());
if (Objects.nonNull(au)) {
updateUserName = au.getName();
updateUserName = au.getUserName();
userMap.put(d.getUpdateBy(), updateUserName);
}
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
View File

@ -87,7 +87,7 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
if (Objects.isNull(createUserName)) {
AdminUser au = adminUserService.getById(d.getCreateBy());
if (Objects.nonNull(au)) {
createUserName = au.getName();
createUserName = au.getUserName();
userMap.put(d.getCreateBy(), createUserName);
}
}
@ -95,7 +95,7 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
if (Objects.isNull(updateUserName)) {
AdminUser au = adminUserService.getById(d.getUpdateBy());
if (Objects.nonNull(au)) {
updateUserName = au.getName();
updateUserName = au.getUserName();
userMap.put(d.getUpdateBy(), updateUserName);
}
}