Merge remote-tracking branch 'origin/master'

sgj

5 天以前 824d4e6be22a1d101897bf1be575bb5e3ed33845

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java

@@ -43,10 +43,14 @@

        param.setCompanyId(ContextUtil.getCompanyId());
        queryWrapper.eq("company_id", param.getCompanyId());

        //库区
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }
        //仓库
        if (StringUtils.isNotBlank(param.getDepotId())) {
            queryWrapper.eq("depot_id", param.getDepotId());
        }
        queryWrapper.orderByDesc("create_time");

        return queryWrapper;