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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -104,14 +104,14 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         String roleNameList = coreDrillPlanToRoleMapper.selectRoleNameByPlanId(record.getId()).stream().map(CoreDrillPlanRoleVo::getRoleName).collect(Collectors.joining(","));
         record.setPlanRoleNameList(roleNameList);
         request.setId(record.getId());
-        List<CoreDrillPlanPageVo> children = coreDrillPlanMapper.selectChildrenPlan(request);
-        record.setChildren(children);
-        for (CoreDrillPlanPageVo child : children) {
-            if (ObjectUtil.equal(child.getCreateOrgId(), orgId)) {
-                child.setCreateByTopOrg(1);
-            }
-            child.setPlanRoleNameList(roleNameList);
-        }
+//        List<CoreDrillPlanPageVo> children = coreDrillPlanMapper.selectChildrenPlan(request);
+//        record.setChildren(children);
+//        for (CoreDrillPlanPageVo child : children) {
+//            if (ObjectUtil.equal(child.getCreateOrgId(), orgId)) {
+//                child.setCreateByTopOrg(1);
+//            }
+//            child.setPlanRoleNameList(roleNameList);
+//        }
         if (record.getStandard() == 1) {
             final Integer done = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
             record.setDone(done);

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

@@ -105,14 +105,14 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         String roleNameList = coreEduTrainingPlanToRoleMapper.selectRoleNameByPlanId(record.getId()).stream().map(CoreEduTrainingPlanRoleVo::getRoleName).collect(Collectors.joining(","));
         record.setPlanRoleNameList(roleNameList);
         request.setId(record.getId());
-        List<CoreEduTrainingPlanPageVo> children = coreEduTrainingPlanMapper.selectChildrenPlan(request);
-        record.setChildren(children);
-        for (CoreEduTrainingPlanPageVo child : children) {
-            if (ObjectUtil.equal(child.getCreateOrgId(), orgId)) {
-                child.setCreateByTopOrg(1);
-            }
-            child.setPlanRoleNameList(roleNameList);
-        }
+//        List<CoreEduTrainingPlanPageVo> children = coreEduTrainingPlanMapper.selectChildrenPlan(request);
+//        record.setChildren(children);
+//        for (CoreEduTrainingPlanPageVo child : children) {
+//            if (ObjectUtil.equal(child.getCreateOrgId(), orgId)) {
+//                child.setCreateByTopOrg(1);
+//            }
+//            child.setPlanRoleNameList(roleNameList);
+//        }
 
         if (record.getStandard() == 1) {
             final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());