WangHan
2024-12-19 fae8a9349499cd045bc73e8fd22aeae52618a46c
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -305,7 +305,9 @@
        if (sysInfo == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        // formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
        if (param2.getAgencyId() == null) {
            formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
        }
        GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
        return ResponseValue.success(genericPager);
    }
@@ -455,6 +457,9 @@
                            if (StrUtil.isEmpty(goodsType)) {
                                throw new ExcelAnalysisException("第" + index + "条数据,物品类型不能为空:" + goodsType);
                            }
                            if(!"自采".equals(goodsType) && !"集采".equals(goodsType)){
                                throw new ExcelAnalysisException("第" + index + "条数据,物品类型取值为[自采/集采] 数据源值为:" + goodsType);
                            }
                            // 第一次进来把外层的值设置一下
                            if (lWhFormProcureParam.getAgencyId() == null) {