commit

src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java

@@ -121,7 +121,7 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
     }
 
     @Override
-    public List<NutMap> activityData(Integer year, Integer isActivity, Integer applyStatus) {
+    public Pagination activityData(Integer year, Integer isActivity, Integer applyStatus) {
 
         Sql sql = Sqls.create("""
                 SELECT
@@ -186,8 +186,8 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
         cnd.desc("school.applyStartTime");
 
         sql.setCondition(cnd);
-
-        return listMap(sql);
+        Pagination pagination = listPageMap(1, 50, sql);
+        return pagination;
     }
 
     @Override

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/h5controller/H5HealthCheckupController.java

@@ -139,6 +139,10 @@ public class H5HealthCheckupController {
     @Aop(TransAop.READ_COMMITTED)
     @SaCheckPermission(value = {"h5.healthCheckup.list", "h5.healthCheckup.mine"}, mode = SaMode.OR)
     public Result doSubmit(@Param("userSelection") HealthCheckupUserSelection userSelection) {
+        BigDecimal money = userSelection.getMoney();
+        if (money.compareTo(BigDecimal.ZERO) <= 0) {  // 小于等于0
+            return Result.error("金额必须大于0，当前医院没有符合您的选项！");
+        }
         if (StrUtil.isNotBlank(userSelection.getId())) {
             baseService.dao().clearLinks(userSelection, "companionList");
             baseService.dao().delete(HealthCheckupUserSelection.class, userSelection.getId());
@@ -208,7 +212,7 @@ public class H5HealthCheckupController {
     public Result getSubjectMoney(String id, String marriage) {
         List<HealthCheckupProjectSubjectMoney> list = healthCheckupProjectService.dao().query(HealthCheckupProjectSubjectMoney.class, Cnd.where(HealthCheckupProjectSubjectMoney::getSubjectId, "=", id));
         BigDecimal money = BigDecimal.valueOf(0.00);
-        String subjectMoneyId = null;
+        String subjectMoneyId = "";
         for (HealthCheckupProjectSubjectMoney subject : list) {
             // 是否满足条件
             Cnd cnd = Cnd.where("id", "=", SecurityUtil.getUserId());
@@ -221,7 +225,7 @@ public class H5HealthCheckupController {
             }
         }
 
-        return Result.success().addData(Map.of("money", money,"subjectMoneyId",subjectMoneyId));
+        return Result.success().addData(Map.of("money", money, "subjectMoneyId", subjectMoneyId));
     }