From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java
index 3d6c786..47d2b64 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TInvoice;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.ITInvoiceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -36,6 +37,9 @@
@Autowired
private ShiroExtUtil shiroExtUtil;
+
+ @Autowired
+ private ITCompanyService tCompanyService;
/**
* 跳转到开发票列表首页
@@ -88,6 +92,8 @@
String name,
Integer type,
Integer state) {
+ //获取当前用户的公司id
+ Integer companyId = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getId();
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(insertTime)) {
@@ -96,11 +102,7 @@
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(tInvoiceService.getInvoiceList(page, beginTime, endTime, email, name, type, state));
- }
+ page.setRecords(tInvoiceService.getInvoiceList(page, beginTime, endTime, email, name, type, state,companyId));
return super.packForBT(page);
}
--
Gitblit v1.7.1