From 394f4a193d56405e9aad63ef2cd8f715cb050bf9 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 22 Jan 2021 11:37:49 +0800
Subject: [PATCH] 点赞bug
---
zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html | 3 ++-
zq-erp/src/main/resources/templates/views/admin/hive-erp/store/store-list.html | 2 +-
zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
index 2bb6af6..ddd6408 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java
@@ -113,7 +113,7 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
SysFollowup followup = followupDao.selectById(id);
String zans=followup.getZans();
- if(StringUtils.isNotBlank(zans)){
+ if(StringUtils.isBlank(zans)){
List<Long> zanIds = StringUtils.strToCollToLong(zans, ",");
List<Long> zaned = zanIds.stream().filter(zanid -> zanid.equals(user.getSuId())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(zaned)){
@@ -164,7 +164,6 @@
List<SysFollowup> rows= followupDao.selectByAppDto(followupListDto);
return AjaxResult.buildSuccessInstance(rows,"查询成功");
}
-
}
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/store/store-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/store/store-list.html
index b906aa3..4b0e032 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/store/store-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/store/store-list.html
@@ -186,7 +186,7 @@
alarmNum = row.alarmNum;
}
var storeNum = parseInt(value);
- if (alarmNum >= storeNum) {
+ if (alarmNum > storeNum) {
html = '<span class="label-danger" > ' + value
+ ' </span>';
} else {
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html
index fd4c63e..a3c1d02 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list.html
@@ -181,7 +181,8 @@
alarmNum = row.alarmNum;
}
var storeNum = parseInt(value);
- if (alarmNum >= storeNum) {
+ console.log(alarmNum,storeNum);
+ if (alarmNum > storeNum) {
html = '<span class="label-danger" > ' + value
+ ' </span>';
} else {
--
Gitblit v1.9.1