20201111v1.6

mt/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -53,7 +53,7 @@
         if(pp.id is null and a.mId is null,0,1) as joinProject
         FROM
 		t_compete_group cg
-        LEFT JOIN t_compete_player p on (cg.id = p.compete_group_id or (cg.sex = p.gender and cg.group_remark = p.group_remark))
+        LEFT JOIN t_compete_player p on cg.id = p.compete_group_id
         LEFT JOIN t_compete_project_player pp on p.id = pp.player_id and pp.project_id = #{projectId} and pp.rec_status = 0
         LEFT JOIN
         ( SELECT