From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 9b0ffc8..98e339a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -711,11 +711,11 @@
public R<List<MasterWorker>> map(String cityCode,String name) {
LoginUser loginUser = tokenService.getLoginUser();
- if (null == loginUser) {
- return R.loginExpire("登录失效！");
- }
+// if (null == loginUser) {
+// return R.loginExpire("登录失效！");
+// }
if (cityCode==null) {
- if (loginUser.getIsFranchisee()) {
+ if (loginUser!=null&&loginUser.getIsFranchisee()) {
cityCode = loginUser.getCityList().get(0);
} else {
cityCode = "420100";
--
Gitblit v1.7.1