From 96157c19093a098aaa78c6c9b44a0e8a6c9a6cfe Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 25 十二月 2025 10:23:18 +0800
Subject: [PATCH] bugfix
---
ruoyi-admin/src/main/resources/application-test.yml | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 2 --
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentBigGiftPackageOrderController.java | 10 +++++-----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentCompanyController.java | 10 +++++-----
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 3 ++-
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentBigGiftPackageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentBigGiftPackageOrderController.java
index 8da2028..c13fb96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentBigGiftPackageOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentBigGiftPackageOrderController.java
@@ -52,7 +52,7 @@
*/
@RestController
@RequestMapping("/agent/t-big-gift-package-order")
-@Api(tags = "(嘉视达)供应商大礼包订单")
+@Api(tags = "(嘉视达经销商后台)大礼包订单")
@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class AgentBigGiftPackageOrderController {
@@ -66,7 +66,7 @@
@ApiOperation(value = "大礼包订单列表")
@PostMapping(value = "/pageList")
public R<Page<TBigGiftPackageOrder>> pageList(@RequestBody BigGiftPackageOrderQuery query) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
Page<TBigGiftPackageOrder> tBigGiftPackageOrderPage = new Page<>(query.getPageNum(), query.getPageSize());
@@ -79,7 +79,7 @@
@ApiOperation(value = "大礼包订单详情")
@PostMapping(value = "/detail/{id}")
public R<TBigGiftPackageOrder> detail(@PathVariable Integer id) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
TBigGiftPackageOrder tBigGiftPackageOrder = tBigGiftPackageOrderService.getById(id);
@@ -125,7 +125,7 @@
@ApiOperation(value = "大礼包订单退款申请")
@PostMapping(value = "/applyRefund")
public R<Void> applyRefund(@Validated @RequestBody RefundApplyDTO dto) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
@@ -136,7 +136,7 @@
@ApiOperation(value = "退款申请记录列表")
@PostMapping(value = "/refundList")
public R<Page<TBigGiftPackageOrder>> refundList(@RequestBody RefundApplicationQuery query) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
query.setCompanyId(SecurityUtils.getLoginUser().getUser().getCompanyId());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentCompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentCompanyController.java
index f04b665..53e19a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentCompanyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/agent/AgentCompanyController.java
@@ -35,7 +35,7 @@
*/
@RestController
@RequestMapping("/agent/company")
-@Api(tags = "（经销商后台）公司信息")
+@Api(tags = "（嘉视达经销商后台）公司信息")
@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class AgentCompanyController extends BaseController {
@@ -49,7 +49,7 @@
// 获取当前登录用户
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
// 获取用户所属公司ID
@@ -70,7 +70,7 @@
@ApiOperation(value = "公司详情-管理人员列表")
@PostMapping(value = "/getCompanyUserList")
public R<Page<SysUser>> getCompanyUserList(@RequestBody BasePage pageReq) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
// 获取当前登录用户
@@ -85,7 +85,7 @@
@ApiOperation(value = "推广记录")
@PostMapping("/promotionPageList")
public R<Page<PromotionPageListVo>> promotionPageList(@RequestBody @Valid PromotionPageListQuery query) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
Page<PromotionPageListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
@@ -98,7 +98,7 @@
@ApiOperation(value = "收益明细")
@PostMapping("/profitPageList")
public R<Page<ProfitPageListVo>> profitPageList(@RequestBody @Valid ProfitPageListQuery query) {
- if (!SecurityUtils.isAgentUser()) {
+ if (SecurityUtils.isAgentUser()) {
throw new ServiceException("请使用经销商/股东帐号访问");
}
Page<ProfitPageListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 631412c..4681cf5 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -65,7 +65,7 @@
devtools:
restart:
# 热部署开关
- enabled: true
+ enabled: false
# redis 配置
redis:
# 地址
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index 8f7a15e..f6b7450 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.exception.ServiceException;
import javax.annotation.Resource;
+import java.util.Objects;
/**
* 安全服务工具类
@@ -156,6 +157,6 @@
* @return
*/
public static boolean isAgentUser(){
- return !getLoginUser().getUser().getRoleType().equals(1);
+ return Objects.isNull(getLoginUser().getUser().getRoleType()) || getLoginUser().getUser().getRoleType().equals(1);
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index f1a6cae..5fbe4c4 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -1,7 +1,6 @@
package com.ruoyi.framework.web.service;
import cn.hutool.core.util.PhoneUtil;
-import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
@@ -26,7 +25,6 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TAppUserService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
--
Gitblit v1.7.1