diff --git a/.gitignore b/.gitignore index a629255..b51c618 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,28 @@ -# Maven build output is generated locally and must not be versioned. -/target/ +# Maven build output +target/ +*.class -# IDEA workspace settings belong to the local developer environment. -/.idea/workspace.xml +# IDE settings +.idea/ +*.iml +*.ipr +*.iws +.vscode/ +.classpath +.project +.settings/ +target +# Logs and temporary files +*.log +/logs/ +/temp/ +/tmp/ +*.tmp +*.swp +*.swo +*~ + +# Operating system files +.DS_Store +Thumbs.db +Desktop.ini diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 1f9e86e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 3acadd7..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 810d740..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/java/io/v/nutz/trainSignUp/controller/mobile/MTrainSignUpActivityController.java b/src/main/java/io/v/nutz/trainSignUp/controller/mobile/MTrainSignUpActivityController.java index fede5c2..e643a80 100644 --- a/src/main/java/io/v/nutz/trainSignUp/controller/mobile/MTrainSignUpActivityController.java +++ b/src/main/java/io/v/nutz/trainSignUp/controller/mobile/MTrainSignUpActivityController.java @@ -277,7 +277,7 @@ public class MTrainSignUpActivityController { if(signFullByUnionId) { return Result.error("该活动您所在的分工会名额已报满"); } - if(course.getReserveMode() == 2 && currentFamilyNumber == null) { + if(Integer.valueOf(2).equals(course.getReserveMode()) && currentFamilyNumber == null) { //课程已报人数 List signUpUsers = dao.query(TrainSignUpUser.class, Cnd.where("courseId", "=", courseId)); int hasRegisterNum = signUpUsers.size() + 1;//+1是算自己 diff --git a/src/main/java/io/v/nutz/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java b/src/main/java/io/v/nutz/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java index bddf80b..2f45e46 100644 --- a/src/main/java/io/v/nutz/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java +++ b/src/main/java/io/v/nutz/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java @@ -336,7 +336,7 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl - +
{{activity.activityName}}