Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-01 92480c7fd17a6bf89205ffcf4b78eef17988f0d5

 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)) {
@@ -99,7 +105,7 @@
        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);
    }