From 53e7dce8d55487cbac64e4374ec9aa1b52a6c6ed Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Thu, 09 Mar 2023 21:16:43 +0800
Subject: [PATCH] 解决npe问题
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialService.java
index 6acc8c0..40ccea1 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialService.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialService.java
@@ -1,26 +1,31 @@
package com.gkhy.safePlatform.equipment.service;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.equipment.model.dto.req.ParamForm;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialAddReq;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialModReq;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialQuery;
+import com.gkhy.safePlatform.equipment.model.dto.resp.MaterialClassificationDto;
+import com.gkhy.safePlatform.equipment.model.dto.resp.MaterialDepartmentDto;
import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialDto;
import java.util.List;
public interface SafeMaterialService {
- ResultVO save(SafeMaterialAddReq req);
+ ResultVO save(ContextCacheUser currentUser,SafeMaterialAddReq req);
- ResultVO update(SafeMaterialModReq req);
+ ResultVO update(ContextCacheUser currentUser,SafeMaterialModReq req);
- ResultVO queryById(Long id);
+ ResultVO queryById(ContextCacheUser currentUser,Long id);
- ResultVO delete(Long id);
+ ResultVO delete(ContextCacheUser currentUser,Long id);
- ResultVO deleteBatch(Long[] ids);
+ ResultVO deleteBatch(ContextCacheUser currentUser, ParamForm paramForm);
- ResultVO list();
- SearchResultVO<List<SafeMaterialDto>> listByPage(PageQuery<SafeMaterialQuery> pageQuery);
+ List<MaterialDepartmentDto> list(ContextCacheUser currentUser);
+ List<MaterialClassificationDto> listByDepId(ContextCacheUser currentUser);
+ SearchResultVO<List<SafeMaterialDto>> listByPage(ContextCacheUser currentUser,PageQuery<SafeMaterialQuery> pageQuery);
}
--
Gitblit v1.9.2