Merge remote-tracking branch 'remotes/origin/V0.0.1' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -283,7 +283,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         List<SysOrg> orgList;
         if (ObjectUtil.isEmpty(planExecOrgList)) {
             Integer orgType = plan.getExecOrgType();
-            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectByOrgPathAndOrgType(plan.getBelongOrgPath(),orgType, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectByOrgPathAndOrgType(plan.getBelongOrgPath(), orgType, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         } else {
             List<Long> list = planExecOrgList.stream().map(CoreEduTrainingPlanToExecOrg::getOrgId).collect(Collectors.toList());
             orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgByIdList(list, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
@@ -491,9 +491,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             data.put("image", new ArrayList<>());
         } else {
             String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
+            String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
             List<String> collect = taskUserList.stream().filter(item -> item.getType() == 1 && ObjectUtil.isNotEmpty(item.getSignImage())).map(CoreEduTrainingTaskToUser::getSignImage).collect(Collectors.toList());
             List<String> list = new ArrayList<>();
             for (String path : collect) {
+                if (path.contains(staticsPath)) {
+                    //删除 /statics 前缀路径
+                    path = path.replace(staticsPath, StringUtil.EMPTY_STRING);
+                }
                 list.add(prefixPath + path);
             }