bug修复

src/main/java/com/xjrsoft/module/activity/service/impl/ActivityEnrollServiceImpl.java

@@ -59,7 +59,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                     setUserId(enrollRange.getUserId());
                                     setCreateDate(createDate);
                                     setActivityInfoId(dto.getActivityInfoId());
-                                    setStatus(1);
+                                    setStatus(2);
                                 }}
                         );
                     }
@@ -78,7 +78,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                         setUserId(user.getId());
                                         setCreateDate(createDate);
                                         setActivityInfoId(dto.getActivityInfoId());
-                                        setStatus(1);
+                                        setStatus(2);
                                     }}
                             );
                         }
@@ -98,7 +98,7 @@ public class ActivityEnrollServiceImpl extends MPJBaseServiceImpl<ActivityEnroll
                                         setUserId(user.getUserId());
                                         setCreateDate(createDate);
                                         setActivityInfoId(dto.getActivityInfoId());
-                                        setStatus(1);
+                                        setStatus(2);
                                     }}
                             );
                         }

src/main/resources/mapper/activity/ActivityInfoMapper.xml

@@ -54,9 +54,9 @@
         </if>
         UNION
         SELECT a1.id, a1.club_activities_name AS NAME,a1.activity_location AS place,a1.start_time AS start_date,a1.end_time AS end_date,
-        NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id,1 AS status,
-        a1.club_activities_content AS content,1 AS enroll_status,
-        3 AS category, a1.activity_type AS type_cn, 1 as is_enroll
+        NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id,1 AS STATUS,
+        a1.club_activities_content AS content,3 AS category,1 AS enroll_status,
+        a1.activity_type AS type_cn, 1 AS is_enroll
         FROM club_activities a1 WHERE a1.delete_mark = 0 AND a1.student_id IN
         (SELECT credential_number FROM xjr_user WHERE id = #{dto.loginUserId})
         UNION