dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-28 15:23:24 +08:00
commit f2a0cf7e29
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
View File

@ -283,7 +283,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
tAccount.setAccountName(accountName); tAccount.setAccountName(accountName);
tAccount.setAccountStatus(Integer.parseInt(accountStatus)); tAccount.setAccountStatus(Integer.parseInt(accountStatus));
tAccount.setPassword(password); tAccount.setPassword(password);
if (ObjectUtil.isNotEmpty(param.get("deptType")) && "2".equals(param.get("deptType"))){ if (ObjectUtil.isNotEmpty(param.get("deptType")) && "2".equals(param.get("deptType")) || "4".equals(param.get("deptType")) ){
tAccount.setOwnerId(2); tAccount.setOwnerId(2);
} }
if (ObjectUtil.isNotEmpty(param.get("deptType")) && "3".equals(param.get("deptType"))){ if (ObjectUtil.isNotEmpty(param.get("deptType")) && "3".equals(param.get("deptType"))){

1
fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
View File

@ -31,6 +31,7 @@ public class ShiroConfig {
filter.setFilters(filters); filter.setFilters(filters);
LinkedHashMap<String,String> filterMap=new LinkedHashMap<>(); LinkedHashMap<String,String> filterMap=new LinkedHashMap<>();
filterMap.put("/backendApi/login/doLogin","anon"); filterMap.put("/backendApi/login/doLogin","anon");
filterMap.put("/backendApi/login/doLogins","anon");
filterMap.put("/backendApi/login/sendMsg","anon"); filterMap.put("/backendApi/login/sendMsg","anon");
filterMap.put("/clientApi/captcha/getCode","anon"); filterMap.put("/clientApi/captcha/getCode","anon");
filterMap.put("/clientApi/sign/**","anon"); filterMap.put("/clientApi/sign/**","anon");

2
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
View File

@ -161,7 +161,7 @@ public class BackendLoginController extends BaseController {
LambdaQueryWrapper<TAccount> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TAccount> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TAccount::getAccountName, accountName); queryWrapper.eq(TAccount::getAccountName, accountName);
TAccount one = accountService.getOne(queryWrapper); TAccount one = accountService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(one) && one.getOwnerId().toString().equals("3")){ if (ObjectUtils.isNotEmpty(one) && ObjectUtils.isNotEmpty(one.getOwnerId()) && one.getOwnerId().toString().equals("3")){
return getFailureResult(201,"请登录油站端！"); return getFailureResult(201,"请登录油站端！");
} }