swagger mysql

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java

@@ -16,7 +16,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -123,12 +125,24 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
     @Override
     public List<ActivityInstanceVO> pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-//
-//        List<PrivilageOrganizational> organizationals = retailCompanyService.listOfRetailCompany(userId, null, 0L);
-//        for (PrivilageOrganizational organizational : organizationals) {
-//            retailCompanyService
-//        }
-        List<ActivityInstanceVO> activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, null);
+        Set<Long> ss = new HashSet<>();
+
+        if(userId != null) {
+            List<PrivilageOrganizational> organizationals = retailCompanyService.listOfRetailCompany(userId, null, 0L);
+            for (PrivilageOrganizational organizational : organizationals) {
+                List<PoiStore> stores = retailCompanyService.selectShopByCompany(organizational.getId());
+                for (PoiStore store : stores) {
+                    ss.add(store.getId());
+                }
+            }
+        }
+        Long[] arr;
+        if(ss.size() <= 0) {
+            arr = null;
+        }else {
+            arr = ss.toArray(new Long[ss.size()]);
+        }
+        List<ActivityInstanceVO> activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, arr);
         AtomicInteger number = new AtomicInteger(1 + ((pageNum - 1) * pageSize));
         //求分页总数
         Page<ActivityInstanceVO> pageList = (Page<ActivityInstanceVO>) activityInstanceVOS;

src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml

@@ -35,12 +35,12 @@ select * from poi_store where id in(select store_id from pmn_activity_store_rela
             store_id=#{storeId}
             )
         </if>
-        <if test="storeIds != null and storeId == null">
+        <if test="storeIds != null and storeIds != '' and storeId == null">
             and t.id in (select instance_id from pmn_activity_store_relation where
             store_id in
             <foreach collection="storeIds" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
+                #{id}
+            </foreach>
             )
         </if>
         <if test="status != null">