commit

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java

@@ -204,7 +204,7 @@ public class FamilyActivityApplyController {
 		if(Lang.isEmpty(courseList)) {
 			return Result.success(new ArrayList<>());
 		}
-		List<String> assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).toList();
+		List<String> assortList = courseList.stream().map(FamilyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
 		return Result.success(assortList);
 	}
 

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyUserManageController.java

@@ -210,6 +210,9 @@ public class FamilyUserManageController {
         excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22));
 
         for (FamilyCourse c : courseList) {
+			if(!c.isMobileSign()) {
+				continue;
+			}
             String courseId = c.getId();
             String courseName = c.getCourseName();
             List<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpApplyController.java

@@ -208,7 +208,7 @@ public class TrainSignUpApplyController {
 		if (Lang.isEmpty(courseList)) {
 			return Result.success(new ArrayList<>());
 		}
-		List<String> assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).toList();
+		List<String> assortList = courseList.stream().map(TrainSignUpCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
 		return Result.success(assortList);
 	}
 

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpUserManageController.java

@@ -208,6 +208,9 @@ public class TrainSignUpUserManageController {
         excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22));
 
         for (TrainSignUpCourse c : courseList) {
+			if(!c.isMobileSign()) {
+				continue;
+			}
             String courseId = c.getId();
             String courseName = c.getCourseName();
             List<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());

src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyApplyController.java

@@ -208,7 +208,7 @@ public class LiteracyApplyController {
 		if (Lang.isEmpty(courseList)) {
 			return Result.success(new ArrayList<>());
 		}
-		List<String> assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).toList();
+		List<String> assortList = courseList.stream().map(LiteracyCourse::getAssort).filter(StrUtil::isNotBlank).distinct().toList();
 		return Result.success(assortList);
 	}
 

src/main/java/com/budwk/app/zhgh/dayofficework/literacy/controller/manage/LiteracyUserManageController.java

@@ -208,6 +208,9 @@ public class LiteracyUserManageController {
         excelCommonExportEntity.add(new ExcelExportEntity("签到时间", "attendTimeExcel", 22));
 
         for (LiteracyCourse c : courseList) {
+			if(!c.isMobileSign()) {
+				continue;
+			}
             String courseId = c.getId();
             String courseName = c.getCourseName();
             List<NutMap> v = userList.stream().filter(x -> x.getString("courseId").equals(courseId)).collect(Collectors.toList());