教育培训bug修改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingPlanController.java

@@ -97,7 +97,7 @@ public class CoreEduTrainingPlanController extends BaseController {
     }
 
     @ApiOperation(value = "计划下发")
-    @RequiresPermissions("core:plan:publish")
+    @RequiresPermissions("core:plan:edit")
     @GetMapping("/publish/{planId}")
     public AjaxResult publishPlan(@PathVariable("planId") Long planId) {
         coreEduTrainingPlanService.publishPlan(planId);

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

@@ -202,7 +202,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         int insert = coreEduTrainingPlanMapper.insert(plan);
 
         //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
-        if ((!checkOrgType(org.getType())) && ObjectUtil.equal(0, plan.getPlanStatus()) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
+        if (/*(!checkOrgType(org.getType())||org.getType()==3) &&*/ ObjectUtil.equal(0, plan.getPlanStatus()) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
             CoreEduTrainingPlanDataVo detailPlanData = this.getCoreEduTrainingPlanDataVo(plan.getId());
             coreEduTrainingTaskService.createTaskForNow(detailPlanData, plan.getStartDate(), plan.getEndDate());
         }

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

@@ -105,7 +105,7 @@
                 )
             </if>
         </where>
-        order by t.status, t.update_time desc
+        order by t.status, t.update_time desc, t.id
     </select>
 
     <select id="selectEduTrainingTaskDetail"