From 3fac173143ee24a5eff4789e2a5e6655617dc0a5 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 28 Aug 2020 18:06:47 +0800
Subject: [PATCH] 20200828_v2.0

---
 pom.xml                                        |  2 +-
 .../ccsens/tall/service/ProMemberService.java  | 18 ++++++++++--------
 tall/src/main/resources/application.yml        |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 43bcd7cb..28f628b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
         <module>tall</module>
 <!--        <module>ht</module>-->
         <module>game</module>
-<!--        <module>mt</module>-->
+        <module>mt</module>
 <!--        <module>health</module>-->
 <!--        <module>ct</module>-->
 <!--        <module>pims</module>-->
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
index ea297095..a83d2ccc 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
@@ -218,14 +218,16 @@ public class ProMemberService implements IProMemberService {
     @Override
     public List<Long> getMemberIdByProjectId(Long projectId) {
         List<Long> memberIdList = null;
-        ProMemberExample memberExample = new ProMemberExample();
-        memberExample.createCriteria().andProjectIdEqualTo(projectId).andUserIdNotEqualTo(0L);
-        List<ProMember> proMemberList = proMemberDao.selectByExample(memberExample);
-        if(CollectionUtil.isNotEmpty(proMemberList)){
-            memberIdList = new ArrayList<>();
-            for(ProMember member : proMemberList){
-                if(ObjectUtil.isNotNull(member.getUserId()) && member.getUserId() != 0){
-                    memberIdList.add(member.getUserId());
+        if(ObjectUtil.isNotNull(projectId)) {
+            ProMemberExample memberExample = new ProMemberExample();
+            memberExample.createCriteria().andProjectIdEqualTo(projectId).andUserIdNotEqualTo(0L);
+            List<ProMember> proMemberList = proMemberDao.selectByExample(memberExample);
+            if (CollectionUtil.isNotEmpty(proMemberList)) {
+                memberIdList = new ArrayList<>();
+                for (ProMember member : proMemberList) {
+                    if (ObjectUtil.isNotNull(member.getUserId()) && member.getUserId() != 0) {
+                        memberIdList.add(member.getUserId());
+                    }
                 }
             }
         }
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b2acd365..4fc2efe4 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: prod
+    include: util-prod,common