Merge remote-tracking branch 'origin/saas_2022_05_17_activity' into saas_2022_05_17_activity

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempLittleArtistTrainingCampServiceImpl.java

@@ -103,7 +103,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         int count = tempLittleArtistTrainingCampUserRelationService.count(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
                 .eq(TempLittleArtistTrainingCampUserRelation::getActivityId, entity.getId()));
         if (count > 0) {
-            throw new BizException("训练营已有学生报名，无法删除");
+            throw new BizException("训练营已有学生报名，无法修改");
         }
         entity.setName(dto.getName());
         entity.setApplyStartDate(dto.getApplyStartDate());

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageUtil.java

@@ -40,12 +40,12 @@ public class PageUtil {
         int limit = Integer.parseInt(String.valueOf(source.getSize()));
         PageInfo<T> resultPage = new PageInfo<>();
         resultPage.setRows(source.getRecords());
+        resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
         resultPage.setLimit(limit);
         resultPage.setTotal(total);
         return resultPage;
     }
 
-
     /**
      * 获取Map中的关键字获取分页数据
      *

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -92,6 +92,10 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		android_extras.put("url", url);
 		android_extras.put("memo", url);
 		android.put("extras", android_extras);
+        //2022年5月27日 增加以下参数，是因为安卓无法跳转到APP中
+        JSONObject intentParam = new JSONObject();
+        intentParam.put("url", "intent:#Intent;action=android.intent.action.MAIN;end");
+        android.put("intent", intentParam);
 
 		JSONObject ios = new JSONObject();// ios通知内容
 		ios.put("alert", alert);