From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index 8ad9843..d306128 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -11,6 +11,7 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -225,8 +226,14 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
+ Integer companyType = null;
+ Integer companyId = null;
+ if(1 != user.getRoleType()){
+ companyType = user.getRoleType();
+ companyId = user.getObjectId();
+ }
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(driverActivityService.getList(page,beginTime,endTime,name,user.getRoleType(),user.getObjectId()));
+ page.setRecords(driverActivityService.getList(page,beginTime,endTime,name,companyType,companyId));
return super.packForBT(page);
}
@@ -305,8 +312,12 @@
@RequestMapping(value = "/updateStatus")
@ResponseBody
public Object updateStatus(DriverActivity driverActivity) {
+ DriverActivity driverActivity1 = driverActivityService.selectById(driverActivity.getId());
+ if(System.currentTimeMillis() >= driverActivity1.getEndTime().getTime()){
+ return ResultUtil.error("活动已结束，修改状态失败");
+ }
driverActivityService.updateById(driverActivity);
- return SUCCESS_TIP;
+ return ResultUtil.success();
}
@RequestMapping("/driverActivity_detail/{driverActivityId}")
--
Gitblit v1.7.1