Merge remote-tracking branch 'origin/master'

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptMapper.xml

@@ -148,7 +148,9 @@
     <select id="countCount" resultType="long">
         select count(1)
         from gk_cmpt a left join common.neucmpt b on a.cmpt_id=b.gtCmptId
-        left join raceenroll.competition c on b.gcmptid=c.cmptid
+        left join common.neuuser nu on nu.neuUserId = b.committeeNeuUserId
+        left join raceenroll.competition c on b.gcmptid =c.cmptid
+        LEFT JOIN raceenroll.registerinfo cbf ON cbf.userId = nu.gUserId
         where a.del_flag=0
 
         <include refid="cmpt-where-sql"/>
@@ -176,7 +178,9 @@
         c.area as area,
         c.location as location
         from gk_cmpt a left join common.neucmpt b on a.cmpt_id=b.gtCmptId
-        left join raceenroll.competition c on b.gcmptid=c.cmptid
+        left join common.neuuser nu on nu.neuUserId = b.committeeNeuUserId
+        left join raceenroll.competition c on b.gcmptid =c.cmptid
+        LEFT JOIN raceenroll.registerinfo cbf ON cbf.userId = nu.gUserId
         where a.del_flag=0
         <include refid="cmpt-where-sql"/>
         order by c.startTime desc
@@ -194,7 +198,7 @@
             and now() >= c.startTime and c.endTime >= now()
         </if>
         <if test="param.userId > 0">
-            and c.createUserId=#{param.userId}
+            AND (c.createUserId=#{param.userId} OR cbf.userId = #{param.userId})
             and a.cmpt_status = 2
         </if>
         <if test="param.userId lt  0">