fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -1071,15 +1071,18 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImport.setCause("用户信息错误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
-            }
-            List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
-            if (!userSubscribes.isEmpty()) {
-                UserSubscribe userSubscribe = userSubscribes.get(0);
-                String name = getName(userSubscribe.getStudentType().longValue());
-                if (!userSubscribeImport.getStudentType().equals(name)) {
-                    userSubscribeImport.setCause("学员类型错误");
-                    userSubscribeImports.add(userSubscribeImport);
-                    continue;
+            }else {
+                List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
+                if (!userSubscribes.isEmpty()){
+                    UserSubscribe userSubscribe = userSubscribes.get(0);
+                    if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
+                        String name = getName(userSubscribe.getStudentType().longValue());
+                        if (!userSubscribeImport.getStudentType().equals(name)){
+                            userSubscribeImport.setCause("学员类型错误");
+                            userSubscribeImports.add(userSubscribeImport);
+                            continue;
+                        }
+                    }
                 }
             }
             userSubscribeAddBo.setUserId(userId);
@@ -1394,6 +1397,19 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImport.setCause("用户信息错误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
+            }else {
+                List<UserSubscribe> userSubscribes = this.list(new LambdaQueryWrapper<UserSubscribe>().eq(UserSubscribe::getUserId, userId).eq(UserSubscribe::getSubscribeStatus, 1).last("limit 1"));
+                if (!userSubscribes.isEmpty()){
+                    UserSubscribe userSubscribe = userSubscribes.get(0);
+                    if (Validator.isNotEmpty(userSubscribeImport.getStudentType())){
+                        String name = getName(userSubscribe.getStudentType().longValue());
+                        if (!userSubscribeImport.getStudentType().equals(name)){
+                            userSubscribeImport.setCause("学员类型错误");
+                            userSubscribeImports.add(userSubscribeImport);
+                            continue;
+                        }
+                    }
+                }
             }
             userSubscribeAddBo.setUserId(userId);
             //预约状态