From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java    |    8 ++++----
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java |   32 +++++++++++++++++---------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
index 17e5f19..83a5405 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
@@ -53,7 +53,7 @@
 
 		return this.examineMngService.queryAll(pageQuery);
     }
-	
+
 
     /**
      * 通过主键查询单条数据
@@ -76,9 +76,9 @@
     @PostMapping(value = "/addOrUpdate")
     public ResultVO update(Authentication authentication, @RequestBody ExamineMng examineMng) {
         // 获取当前用户
-        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+/*        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
         examineMng.setExamineDepartmentId(currentUser.getDepId());
-        examineMng.setExaminePersonId(currentUser.getUid());
+        examineMng.setExaminePersonId(currentUser.getUid());*/
         if (examineMng.getId() == null) {
             return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
         } else {
@@ -117,4 +117,4 @@
 
         System.out.println(JSONObject.toJSONString(examineTemplateSaveOrUpdate));
     }
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
index dbb18c1..c22edb7 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -51,8 +51,8 @@
 
     @Resource
     private CommonService commonService;
-    
-	
+
+
 	@Override
     public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
         PageUtils.checkCheck(pageQuery);
@@ -135,19 +135,21 @@
         List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
         List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
 
-        List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
-        Map<Long,ExamineItem> itemMap = itemList.stream().collect(
-                Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
+        if(!idList.isEmpty()) {
+            List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
+            Map<Long, ExamineItem> itemMap = itemList.stream().collect(
+                    Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1));
 
-        if(itemMap != null){
-            list.forEach(f->{
-                ExamineItem item = itemMap.get(f.getId());
-                if(item != null){
-                    f.setItemDetail(item.getItemDetail());
-                    f.setContent(item.getContent());
-                    f.setJudgeStandard(item.getJudgeStandard());
-                }
-            });
+            if (itemMap != null) {
+                list.forEach(f -> {
+                    ExamineItem item = itemMap.get(f.getId());
+                    if (item != null) {
+                        f.setItemDetail(item.getItemDetail());
+                        f.setContent(item.getContent());
+                        f.setJudgeStandard(item.getJudgeStandard());
+                    }
+                });
+            }
         }
         dto.setCurrentExamineDtoList(list);
 
@@ -177,4 +179,4 @@
         });
         examineMngBaseService.updateBatchById(delList);
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.2