文化活动，撤回、重新提交整改

src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java

@@ -146,6 +146,7 @@ public class ActivityCultureApplyActivityController {
     @SaCheckLogin
     @ApiOperation("重新提交申请")
     @Aop(TransAop.READ_COMMITTED)
+    @SaCheckPermission(value = {"activity.culture.applyActivity.school", "activity.culture.applyActivity.union", "activity.culture.applyActivity.club"}, mode = SaMode.OR)
     public Result submitAgain(@Param("data") ActivityTissue tissue, @Param("taskId") Long taskId) {
         if (tissue.getActivity_type() == 40002) {
             tissue.setUnionId(SecurityUtil.getUnionId());
@@ -154,12 +155,10 @@ public class ActivityCultureApplyActivityController {
         tissue.setApplyTime(DateUtil.now());
         activityCultureService.insertOrUpdate(tissue);
 
-        if (tissue.getActivity_type() == 40002 || tissue.getActivity_type() == 40003){
             Dict dict = Dict.create();
             dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
             dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
             flowCommonService.executeTask(dict);
-        }
         return Result.success();
     }
 

src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java

@@ -139,7 +139,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
         } else {
             cnd.desc("tissue.startTime");
         }
-
+        //cnd.groupBy("tissue.id");
         sql.setCondition(cnd);
         return this.listPageMap(page.getPageNumber(), page.getPageSize(), sql);
     }