Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

yumeng 5 лет назад
Родитель
Сommit
f40daef677

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -493,6 +493,10 @@ public class MaterialInfoController {
         List<String> effiList = materialInfoService.getEffiCode();
         Object createTime = materialInfo.getCreateTime();
         materialInfo.setCreateTime(null);
+        Long projectId = materialInfo.getProjectId();
+        if(projectId != null){
+            queryWrapper.eq("project_id", projectId);
+        }
         queryWrapper.in("code", effiList);
         queryWrapper.groupBy("code");
         //queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());