fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/DangAnController.java

@@ -195,8 +195,7 @@ public class DangAnController extends BaseController {
     public AjaxResult userDataDownload(@RequestBody UserDownloadBo bo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         bo.setCreateSysUserId(loginUser.getUser().getUserId());
-        iUserService.userDataDownload(bo);
-        return AjaxResult.success();
+        return AjaxResult.success(iUserService.userDataDownload(bo));
     }
 
     @ApiOperation("学员资料下载任务")

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

@@ -159,7 +159,7 @@ public interface IUserService extends IService<User> {
 
     void userDataImgImport(MultipartFile file);
 
-    void userDataDownload(UserDownloadBo bo);
+	String userDataDownload(UserDownloadBo bo);
 
 	List<UserDownloadVo> userDataDownloadList(Long userId);
 

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

@@ -1072,20 +1072,20 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 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;
-//                        }
-//                    }
-//                }
-//            }
+            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);
             //预约状态
             userSubscribeAddBo.setSubscribeStatus(1);