张延森 3 years ago
parent
commit
d5357e5819

+ 1
- 1
pom.xml View File

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.yunzhi</groupId>
12 12
 	<artifactId>marketing</artifactId>
13
-	<version>v1.0.28</version>
13
+	<version>v1.0.32</version>
14 14
 	<name>marketing-cloud</name>
15 15
 	<description>新联康营销云</description>
16 16
 

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java View File

@@ -287,7 +287,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
287 287
     }
288 288
 
289 289
     @Override
290
-    public ResponseBean getCardDetail(String openid, String id,String personId) {
290
+    public ResponseBean getCardDetail(String openid, String id, String personId) {
291 291
         // 卡片人员
292 292
         TaPerson person = taPersonMapper.selectById(id);
293 293
         if (null == person) {

+ 1
- 1
src/main/resources/application-prod.yml View File

@@ -6,7 +6,7 @@ spring:
6 6
   datasource:
7 7
     username: marketing
8 8
     password: u@cSFJ5*kS9hGP7a
9
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
9
+    url: jdbc:mysql://210.13.107.60:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
10 10
     driver-class-name: com.mysql.cj.jdbc.Driver
11 11
     initial-size: 10 # 初始化连接数
12 12
     max-active: 20 # 最大连接数

+ 2
- 1
src/main/resources/mapper/xlk/BuildingChannelMapper.xml View File

@@ -8,8 +8,9 @@
8 8
         FROM
9 9
             xlk_building_channel t
10 10
             INNER JOIN ta_channel_person c ON t.channel_id = c.channel_id
11
-            LEFT JOIN ta_building b ON t.building_id = b.building_id
11
+            INNER JOIN ta_building b ON t.building_id = b.building_id
12 12
         WHERE
13 13
             c.person_id = #{personId}
14
+            AND b.status = 1
14 15
     </select>
15 16
 </mapper>