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

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

@@ -439,7 +439,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             CoreEduTrainingPlan coreEduTrainingPlan = new CoreEduTrainingPlan();
             BeanUtils.copyProperties(plan, coreEduTrainingPlan);
             coreEduTrainingPlan.setId(IdWorker.getId());
-            coreEduTrainingPlan.setBuildTaskNow(0);
+//            coreEduTrainingPlan.setBuildTaskNow(plan.getBuildTaskNow());
             coreEduTrainingPlan.setBelongOrgId(sysOrg.getId());
             coreEduTrainingPlan.setBelongOrgName(sysOrg.getName());
             coreEduTrainingPlan.setBelongOrgPath(sysOrg.getPath());

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingPlanMapper.xml

@@ -468,6 +468,12 @@
             and p.id in ( <include refid="pageRoleIncludeReuqest"/>)
         </if>
         <include refid="pageIncludeP"/>)
+        or ( p.standard=1 and p.issue=1 and p.deleted=0 and p.parent_id is null
+        <if test="request.planRoleId!=null">
+            and p.id in ( <include refid="pageRoleIncludeReuqest"/>)
+        </if>
+        <include refid="pageIncludeP"/>)
+        order by p.create_time desc
     </select>
     <select id="selectPageData1" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo">
         select p.id as id,