1.专场企业查询bugfix

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsSpecialService.java

@@ -1,21 +1,14 @@
 package com.sckw.system.service;
 
-import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.EntTypeEnum;
-import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.NumberUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
-import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.system.api.model.dto.res.EntCacheResDto;
-import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.system.dao.KwsEntSpecialDao;
 import com.sckw.system.dao.KwsEnterpriseDao;
 import com.sckw.system.dao.KwsSpecialDao;
@@ -28,7 +21,6 @@ import com.sckw.system.model.vo.req.KwsSpecialAddReqVo;
 import com.sckw.system.model.vo.req.KwsSpecialUpdateReqVo;
 import com.sckw.system.model.vo.res.KwsSpecialEntResVo;
 import com.sckw.system.model.vo.res.KwsSpecialResVo;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +28,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @desc 专场
@@ -359,17 +352,24 @@ public class KwsSpecialService {
             entIds.add(special.getEntId());
             if (special.getIsMain() == NumberConstant.ONE) {
                 //公共平台企业
-                entIds = kwsEntSpecialDao.findListByEntType(new HashMap<>() {{
+                List<Long> entIdList = kwsEntSpecialDao.findListByEntType(new HashMap<>() {{
                     put("mainPlatform", NumberConstant.ONE);
                     put("type", type);
                 }});
+                if (entIdList.size()>0){
+                    entIds.addAll(entIdList);
+                }
             } else {
                 //专场关联企业
-                entIds = kwsEntSpecialDao.findListByEntType(new HashMap<>() {{
+                List<Long> entIdList = kwsEntSpecialDao.findListByEntType(new HashMap<>() {{
                     put("specialId", special.getId());
                     put("type", type);
                 }});
+                if (entIdList.size()>0){
+                    entIds.addAll(entIdList);
+                }
             }
+            entIds = entIds.stream().distinct().collect(Collectors.toList());
         }
         return entIds;
     }