diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsReadingController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsReadingController.java index a56917a..6e29c69 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsReadingController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsReadingController.java @@ -51,7 +51,7 @@ public class ActivitySportsReadingController { ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId())); Cnd cnd = Cnd.NEW(); cnd.and("close", "!=", true); - cnd.and("YEAR(startTime)", "=", year); + cnd.and("YEAR(applyStartTime)", "=", year); cnd.and("activityLevel", "=", activityLevel); if (!AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SYSADMIN.name())) { if (activityLevel.equals("40002")) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java index 2804dbe..9480e49 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java @@ -87,7 +87,10 @@ public class H5ActivitySportsApplyUserController { ActivitySchoolEvent schoolEvent = dao.fetch(ActivitySchoolEvent.class, schoolEventId); ActivityEvent activityEvent = dao.fetch(ActivityEvent.class, eventId); ActivitySchool activitySchool = dao.fetch(ActivitySchool.class, activityId); - ActivitySchoolTeam schoolTeam = dao.fetch(ActivitySchoolTeam.class, teamId); + ActivitySchoolTeam schoolTeam = null; + if (teamId != null && !teamId.isEmpty()) { + schoolTeam = dao.fetch(ActivitySchoolTeam.class, teamId); + } ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId())); ActivityBasicUnion basicUnion = dao.fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionId())); @@ -105,10 +108,10 @@ public class H5ActivitySportsApplyUserController { } //如果不等于空代表是个人项目 if (ObjectUtil.isNotEmpty(activityEvent.getIsMenWomen())) { - if (activityEvent.getIsMenWomen() == 1 && !List.of("男","男性").contains(user.getSex())) { + if (activityEvent.getIsMenWomen() == 1 && !List.of("男", "男性").contains(user.getSex())) { return Result.error("当前项目只能男性能报名!"); } - if (activityEvent.getIsMenWomen() == 2 && !List.of("女","女性").contains(user.getSex())) { + if (activityEvent.getIsMenWomen() == 2 && !List.of("女", "女性").contains(user.getSex())) { return Result.error("当前项目只能女性能报名!"); } } @@ -182,8 +185,10 @@ public class H5ActivitySportsApplyUserController { schoolApply.setStatus(2); } schoolApply.setUnitname(user.getUnitName()); - schoolApply.setTeamId(schoolTeam.getId()); - schoolApply.setTeam(schoolTeam.getName()); + if (schoolTeam != null){ + schoolApply.setTeamId(schoolTeam.getId()); + schoolApply.setTeam(schoolTeam.getName()); + } schoolApply.setLoginname(user.getLoginname()); schoolApply.setUsername(user.getUsername()); schoolApply.setMobile(user.getMobile()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java index e116bd6..df8f463 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java @@ -205,7 +205,7 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC sysHomeActivity.setName(this.getName()); sysHomeActivity.setCover(this.getImage()); sysHomeActivity.setUrl("/platform/activity/apply"); - sysHomeActivity.setH5Url(null); + sysHomeActivity.setH5Url("/platform/activity/apply/h5/index?id=" + this.getId()); sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime())); sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime())); sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());