|
@@ -31,9 +31,6 @@
|
31
|
31
|
<if test="startDate == null or endDate == null ">
|
32
|
32
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
33
|
33
|
</if>
|
34
|
|
- <if test="userId != null and userId != ''">
|
35
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
36
|
|
- </if>
|
37
|
34
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
38
|
35
|
AND
|
39
|
36
|
(a.building_id in
|
|
@@ -87,9 +84,6 @@
|
87
|
84
|
<if test="startDate == null or endDate == null ">
|
88
|
85
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
89
|
86
|
</if>
|
90
|
|
- <if test="userId != null and userId != ''">
|
91
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
92
|
|
- </if>
|
93
|
87
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
94
|
88
|
AND
|
95
|
89
|
(a.building_id in
|
|
@@ -210,9 +204,6 @@
|
210
|
204
|
<if test="startDate == null or endDate == null ">
|
211
|
205
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
212
|
206
|
</if>
|
213
|
|
- <if test="userId != null and userId != ''">
|
214
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
215
|
|
- </if>
|
216
|
207
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
217
|
208
|
AND
|
218
|
209
|
(a.building_id in
|
|
@@ -291,9 +282,6 @@
|
291
|
282
|
<if test="startDate == null or endDate == null ">
|
292
|
283
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
293
|
284
|
</if>
|
294
|
|
- <if test="userId != null and userId != ''">
|
295
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
296
|
|
- </if>
|
297
|
285
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
298
|
286
|
AND
|
299
|
287
|
(a.building_id in
|
|
@@ -527,9 +515,6 @@
|
527
|
515
|
<if test="startDate == null or endDate == null ">
|
528
|
516
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
529
|
517
|
</if>
|
530
|
|
- <if test="userId != null and userId != ''">
|
531
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
532
|
|
- </if>
|
533
|
518
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
534
|
519
|
AND
|
535
|
520
|
(a.building_id in
|
|
@@ -582,9 +567,6 @@
|
582
|
567
|
<if test="startDate == null or endDate == null ">
|
583
|
568
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
584
|
569
|
</if>
|
585
|
|
- <if test="userId != null and userId != ''">
|
586
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
587
|
|
- </if>
|
588
|
570
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
589
|
571
|
AND
|
590
|
572
|
(a.building_id in
|
|
@@ -746,9 +728,6 @@
|
746
|
728
|
<if test="startDate == null or endDate == null ">
|
747
|
729
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
748
|
730
|
</if>
|
749
|
|
- <if test="userId != null and userId != ''">
|
750
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
751
|
|
- </if>
|
752
|
731
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
753
|
732
|
AND
|
754
|
733
|
(a.building_id in
|
|
@@ -801,9 +780,6 @@
|
801
|
780
|
<if test="startDate == null or endDate == null ">
|
802
|
781
|
AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
|
803
|
782
|
</if>
|
804
|
|
- <if test="userId != null and userId != ''">
|
805
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
806
|
|
- </if>
|
807
|
783
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
808
|
784
|
AND
|
809
|
785
|
(a.building_id in
|
|
@@ -990,9 +966,6 @@
|
990
|
966
|
#{taPersonBuildings.buildingId}
|
991
|
967
|
</foreach>
|
992
|
968
|
</if>
|
993
|
|
- <if test="userId != null and userId != ''">
|
994
|
|
- and d.create_user = #{userId}
|
995
|
|
- </if>
|
996
|
969
|
union all
|
997
|
970
|
select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
|
998
|
971
|
ta_live_activity e
|
|
@@ -1009,9 +982,6 @@
|
1009
|
982
|
#{taPersonBuildings.buildingId}
|
1010
|
983
|
</foreach>
|
1011
|
984
|
</if>
|
1012
|
|
- <if test="userId != null and userId != ''">
|
1013
|
|
- and e.create_user = #{userId}
|
1014
|
|
- </if>
|
1015
|
985
|
) as activity
|
1016
|
986
|
|
1017
|
987
|
left join (
|
|
@@ -1211,9 +1181,6 @@
|
1211
|
1181
|
#{taPersonBuildings.buildingId}
|
1212
|
1182
|
</foreach>
|
1213
|
1183
|
</if>
|
1214
|
|
- <if test="userId != null and userId != ''">
|
1215
|
|
- and d.create_user = #{userId}
|
1216
|
|
- </if>
|
1217
|
1184
|
union all
|
1218
|
1185
|
select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
|
1219
|
1186
|
ta_live_activity e
|
|
@@ -1230,9 +1197,6 @@
|
1230
|
1197
|
#{taPersonBuildings.buildingId}
|
1231
|
1198
|
</foreach>
|
1232
|
1199
|
</if>
|
1233
|
|
- <if test="userId != null and userId != ''">
|
1234
|
|
- and e.create_user = #{userId}
|
1235
|
|
- </if>
|
1236
|
1200
|
) as activity
|
1237
|
1201
|
|
1238
|
1202
|
left join (
|
|
@@ -1369,9 +1333,6 @@
|
1369
|
1333
|
or e.building_id = #{buildingId}
|
1370
|
1334
|
)
|
1371
|
1335
|
</if>
|
1372
|
|
- <if test="userId != null and userId != ''">
|
1373
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
1374
|
|
- </if>
|
1375
|
1336
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
1376
|
1337
|
AND
|
1377
|
1338
|
(a.building_id in
|
|
@@ -1514,9 +1475,6 @@
|
1514
|
1475
|
<if test="sharePhone != null and sharePhone != ''">
|
1515
|
1476
|
and f.phone like CONCAT('%',#{sharePhone}, '%')
|
1516
|
1477
|
</if>
|
1517
|
|
- <if test="userId != null and userId != ''">
|
1518
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
1519
|
|
- </if>
|
1520
|
1478
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
1521
|
1479
|
AND
|
1522
|
1480
|
(a.building_id in
|
|
@@ -1641,9 +1599,6 @@
|
1641
|
1599
|
or e.building_id = #{buildingId}
|
1642
|
1600
|
)
|
1643
|
1601
|
</if>
|
1644
|
|
- <if test="userId != null and userId != ''">
|
1645
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
1646
|
|
- </if>
|
1647
|
1602
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
1648
|
1603
|
AND
|
1649
|
1604
|
(a.building_id in
|
|
@@ -1736,9 +1691,6 @@
|
1736
|
1691
|
or e.building_id = #{buildingId}
|
1737
|
1692
|
)
|
1738
|
1693
|
</if>
|
1739
|
|
- <if test="userId != null and userId != ''">
|
1740
|
|
- and (d.create_user = #{userId} or c.create_user = #{userId})
|
1741
|
|
- </if>
|
1742
|
1694
|
<if test="taPersonBuildings != null and taPersonBuildings.size > 0">
|
1743
|
1695
|
AND
|
1744
|
1696
|
(a.building_id in
|