修改bug

Pu Zhibing

5 天以前 e25d138ac2e1a2b271b27bbc1973f0b5898b1d82

 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;
@@ -34,8 +35,11 @@
    @Autowired
    private ITInvoiceService tInvoiceService;
    
    @Resource
    @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);
    }