From 0a8d28436b2f7229ecdf40c6b003902002c8947f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 十月 2025 17:37:08 +0800
Subject: [PATCH] 修改bug

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
index 4f11545..0807929 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
@@ -9,6 +9,7 @@
 import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.common.constant.factory.PageFactory;
 import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.shiro.ShiroUser;
 import com.stylefeng.guns.core.util.IdGenerator;
 import com.stylefeng.guns.core.util.SinataUtil;
 import com.stylefeng.guns.modular.system.model.TLocation;
@@ -142,11 +143,12 @@
             endTime = timeArray[1];
         }
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
-        if (shiroExtUtil.getUser().getRoleType() != 1) {
-            page.setRecords(null);
-        } else {
-            page.setRecords(tSiteService.getSiteList(page, beginTime, endTime, name, insertUser, city, state));
+        ShiroUser user = shiroExtUtil.getUser();
+        Integer companyId = null;
+        if(1 != user.getRoleType()){
+            companyId = user.getObjectId();
         }
+        page.setRecords(tSiteService.getSiteList(page, beginTime, endTime, name, insertUser, city, state, companyId));
         return super.packForBT(page);
     }
 
@@ -159,6 +161,7 @@
         tSite.setInsertTime(new Date());
         tSite.setInsertUserId(shiroExtUtil.getUser().getId());
         tSite.setState(1);
+        tSite.setCompanyId(shiroExtUtil.getUser().getObjectId());
         tSiteService.insert(tSite);
     
         //添加站点区域

--
Gitblit v1.7.1