From a606bc5b0af6bc85b8ce2bca66a1d74fac3751b7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 17:19:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
index da78ce3..3bdd45f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
@@ -165,7 +165,7 @@
TAdvertisementUser tAdvertisementUser = itAdvertisementUserService.selectById(id);
TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementUser.getAdvertisementId());
// 司机所有 TODO
- if("[]".equals(tAdvertisementUser.getDriverId())){
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getDriverId()) && "[]".equals(tAdvertisementUser.getDriverId())){
System.out.println(1111111111);
List<TDriver> list = driverService.selectList(null);
for (TDriver tDriver : list) {
@@ -179,7 +179,7 @@
}
}
}
- }else {
+ }else if(ToolUtil.isNotEmpty(tAdvertisementUser.getDriverId())) {
JSONArray driverId = JSON.parseArray(tAdvertisementUser.getDriverId());
for(int j=0;j<driverId.size();j++){
TDriver tDriver = driverService.selectById(driverId.getJSONObject(j).getInteger("userId"));
@@ -195,7 +195,7 @@
}
}
// 用户所有
- if("[]".equals(tAdvertisementUser.getUserId())){
+ if(ToolUtil.isNotEmpty(tAdvertisementUser.getUserId()) && "[]".equals(tAdvertisementUser.getUserId())){
List<TUser> users = userService.selectList(null);
for (TUser user : users) {
String email = user.getEmail();
@@ -208,7 +208,7 @@
}
}
}
- }else {
+ }else if(ToolUtil.isNotEmpty(tAdvertisementUser.getUserId())) {
JSONArray driverId = JSON.parseArray(tAdvertisementUser.getUserId());
for(int j=0;j<driverId.size();j++){
TUser tUser = userService.selectById(driverId.getJSONObject(j).getInteger("userId"));
--
Gitblit v1.7.1