处理-用户信息提交审批后重复显示

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentCertificateInfoService.java

@@ -80,12 +80,15 @@ public class EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCert
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
                 );
-            } else{
+            } else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                );
+            }else{
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
                                 .or().eq("status", "4")
                                 .or().eq("status", "1")
-
                 );
             }
         }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentEduInfoService.java

@@ -83,7 +83,6 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
             } else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentFamilyInfoService.java

@@ -65,7 +65,6 @@ public class EnrollmentFamilyInfoService extends ServiceImpl<EnrollmentFamilyInf
             } else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentLanguageInfoService.java

@@ -83,7 +83,6 @@ public class EnrollmentLanguageInfoService extends ServiceImpl<EnrollmentLanguag
             } else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentPerformanceInfoService.java

@@ -60,7 +60,6 @@ public class EnrollmentPerformanceInfoService extends ServiceImpl<EnrollmentPerf
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRewardInfoService.java

@@ -83,7 +83,6 @@ public class EnrollmentRewardInfoService extends ServiceImpl<EnrollmentRewardInf
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentSkillInfoService.java

@@ -83,7 +83,6 @@ public class EnrollmentSkillInfoService extends ServiceImpl<EnrollmentSkillInfoM
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentTrainingInfoService.java

@@ -81,7 +81,6 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                         wrapper.eq("status", "2")
-                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentUserInfoAuditService.java

@@ -125,6 +125,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -137,6 +138,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -149,6 +151,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -161,6 +164,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -173,6 +177,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -185,6 +190,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -197,6 +203,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -209,6 +216,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -221,6 +229,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -233,6 +242,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                 wrapper.eq("status", "5")
                                         .or().eq("status", "1")
                                         .or().eq("status", "6")
+                                        .or().eq("status", "4")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -325,6 +335,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.or().eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -333,7 +344,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
-
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -342,6 +353,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -350,6 +362,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -358,6 +371,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -366,6 +380,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -374,6 +389,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -382,6 +398,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -390,7 +407,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
-
+                                        .or().eq("status", "4")
                         )
         );
 
@@ -399,6 +416,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "1")
+                                        .or().eq("status", "4")
 
                         )
         );

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentWorkInfoService.java

@@ -57,7 +57,6 @@ public class EnrollmentWorkInfoService extends ServiceImpl<EnrollmentWorkInfoMap
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->
                                 wrapper.eq("status", "2")
-                                        .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->