bug修改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -315,12 +315,11 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         }
         //核验图片
         final String checkImage = record.getCheckImage();
-        if (ObjectUtil.isEmpty(checkImage) || !checkImage.contains(File.separator)) {
+        if (ObjectUtil.isEmpty(checkImage)) {
             data.put("checkImage", new ArrayList<>());
         } else {
             data.put("checkImage", getFileRealPath(Arrays.asList(checkImage.split(",")), prefixPath, staticsPath));
         }
-        log.info("***********:{}",JSON.toJSONString(data));
         return data;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -272,11 +272,14 @@ public class PanelServiceImpl implements PanelService {
                     continue;
                 }
                 final List<String> list = JSON.parseArray(json, String.class);
-                list.forEach(item -> {
-                    final Map map = JSON.parseObject(item, Map.class);
-                    final String fileName = map.get("url").toString();
-                    fileLit.add(fileName);
-                });
+                for (String str : list) {
+                    final Map map = JSON.parseObject(str, Map.class);
+                    map.put("createTime",vo.getCreateTime());
+
+                    fileLit.add(JSON.toJSONString(map));
+                }
+
+                fileLit.addAll(list);
             }
             hashMap.put("index2", fileLit);
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -215,7 +215,7 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
     @Override
     public WebPanelResult selectWebIndexData(PanelListDto req) {
         final int count = coreSafetyTaskMapper.selectCount(new LambdaQueryWrapper<CoreSafetyTask>()
-                .eq(CoreSafetyTask::getOrgId, req.getOrgId())
+                .eq(CoreSafetyTask::getCheckOrgId, req.getOrgId())
                 .eq(CoreSafetyTask::getStatus, 1))
                 .intValue();
         return WebPanelResult