From ac908d5de755625cbaf95b992642f693c843071c Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 9 Aug 2021 09:45:51 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hai-cweb/src/main/resources/dev/application.yml                | 2 +-
 .../java/com/hai/service/impl/HighDiscountServiceImpl.java     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hai-cweb/src/main/resources/dev/application.yml b/hai-cweb/src/main/resources/dev/application.yml
index eed35273..dcf08e5d 100644
--- a/hai-cweb/src/main/resources/dev/application.yml
+++ b/hai-cweb/src/main/resources/dev/application.yml
@@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hsg_pre?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: HF123456.
     type: com.alibaba.druid.pool.DruidDataSource
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java
index 8cab13ba..593a7371 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountServiceImpl.java
@@ -53,6 +53,9 @@ public class HighDiscountServiceImpl implements HighDiscountService {
         if (MapUtils.getInteger(map, "discountType") != null) {
             criteria.andDiscountTypeEqualTo(MapUtils.getInteger(map, "discountType"));
         }
+        if (MapUtils.getLong(map, "companyId") != null) {
+            criteria.andCompanyIdEqualTo(MapUtils.getLong(map, "companyId"));
+        }
 
         example.setOrderByClause("update_time desc");
         return highDiscountMapper.selectByExample(example);