下级销售列表返回否存在转移申请字段调整

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -96,8 +96,14 @@ public class CompanyUserController extends AppBaseController {
             // 是否存在会员转移申请
             Wrapper<CompanyUserChangeApply> applyWrapper = Wrappers.<CompanyUserChangeApply>lambdaQuery()
                     .eq(CompanyUserChangeApply::getFrom, u.getUserId())
-                    .eq(CompanyUserChangeApply::getStatus, 0);
-            vo.setHasApply(companyUserChangeApplyService.count(applyWrapper) > 0);
+                    .orderByDesc(CompanyUserChangeApply::getApplyTime)
+                    .last("limit 1");
+            CompanyUserChangeApply apply = companyUserChangeApplyService.getOne(applyWrapper);
+            int applyStatus = 3; // 不存在
+            if (Objects.nonNull(apply)) {
+                applyStatus = apply.getStatus();
+            }
+            vo.setApplyStatus(applyStatus);
 
             return vo;
         }).collect(Collectors.toList());

fs-company-app/src/main/java/com/fs/app/vo/CompanySubUserVO.java

@@ -26,7 +26,7 @@ public class CompanySubUserVO extends CompanyUser {
      */
     private BigDecimal todayRedPacketAmount;
     /**
-     * 是否存在待审核转移申请
+     * 审核状态
      */
-    private Boolean hasApply;
+    private Integer applyStatus;
 }