yumeng hace 4 años
padre
commit
203457ce89

+ 3 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -770,9 +770,10 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return materialInfoMapper.getListByDate(startDate, endDate);
     }
 
+
+
     @Override
-    public Map<String, Object> getListByParams(String tagCode, String type, Integer status, String materialName, String code, String startDate, String endDate, String userId, List<Long> projectIds, String clipId, String shotId, String planId, Integer offlineFlag, Integer pageNo, Integer pageSize) {
-        Map<String, Object> result = new HashMap<>();
+    public Map<String, Object> getListByParams(String tagCode, String type, Integer status, List<Long> projectIds, String materialName, String code, String startDate, String endDate, String userId, Long projectId, String clipId, String shotId, String planId, Integer offlineFlag, Integer pageNo, Integer pageSize) {        Map<String, Object> result = new HashMap<>();
         PageHelper.startPage(pageNo, pageSize);
 
         String ascription = null;