From 8c3a275e7542e6e1493d611d2914899bbfdeeef0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Jul 2021 16:15:10 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index 2886da5..3337ac7 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -328,6 +328,11 @@
         if(CollUtil.isNotEmpty(distribDataListVos)){
             for(DistribDataListVo distribDataListVo : distribDataListVos){
                 if(ObjectUtil.isNotEmpty(distribDataListVo)){
+                    String id = distribDataListVo.getId();
+                    String kg = accountMapper.selectOrderByHeadUserId(id);
+                    distribDataListVo.setKg(kg);
+                    String jdsl = accountMapper.selectJDSLByHeadUserId(id);
+                    distribDataListVo.setJdsl(jdsl);
                 }
             }
         }
@@ -339,4 +344,8 @@
         data.put("code", 0);
         return data;
     }
+
+    public DistribDataInfoVo distribDataInfo(DistribDataInfoDto distribDataInfoDto) {
+        return accountMapper.selectDistribDataInfoVo();
+    }
 }

--
Gitblit v1.9.1