From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
index 466ce4d..3683078 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
@@ -381,7 +381,7 @@
for (int m = 0; m <listRegister.size(); m ++) {
boolean reduce = false;
Long uid = listRegister.get(m).getId();
- String vlaue = listRegister.get(m).getChannel().getVlaue();
+ String vlaue = listRegister.get(m).getChannel();
for (int n = 0; n <listOrder.size(); n ++) {
if (channelVlaue.equalsIgnoreCase(vlaue) && uid.longValue() == listOrder.get(n).getUid()) {
@@ -533,7 +533,7 @@
for (int m = 0; m <listRegister.size(); m ++) {
boolean reduce = false;
Long uid = listRegister.get(m).getId();
- String vlaue = listRegister.get(m).getChannel().getVlaue();
+ String vlaue = listRegister.get(m).getChannel();
for (int n = 0; n <listOrder.size(); n ++) {
if (channelVlaue.equalsIgnoreCase(vlaue) && uid.longValue() == listOrder.get(n).getUid()) {
@@ -888,7 +888,7 @@
for (int m = 0; m <listRegister.size(); m ++) {
boolean reduce = false;
Long uid = listRegister.get(m).getId();
- String vlaue = listRegister.get(m).getChannel().getVlaue();
+ String vlaue = listRegister.get(m).getChannel();
for (int n = 0; n <listOrder.size(); n ++) {
if (channelVlaue.equalsIgnoreCase(vlaue) && uid.longValue() == listOrder.get(n).getUid()) {
--
Gitblit v1.8.0