From 55de682ea7666c8bc03aa1a3414e9df78ea75ac6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 04 Mar 2021 15:05:38 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index ba8d937..039320c 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -622,8 +622,11 @@
         documentaryOrderSetInfoVo.setFollowCnt(followCnt);
         
         Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();
-        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);
-        
+        if(maxFollowCnt == 0){
+        	documentaryOrderSetInfoVo.setMaxFollowCnt(null);
+		}
+        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt.toString());
+        log.info(memberId + "-最大持仓张数-"+maxFollowCnt.toString());
 		return Result.ok(documentaryOrderSetInfoVo);
 	}
 

--
Gitblit v1.9.1