招标申请bug修复

release-service/src/main/java/com/mmc/csf/release/controller/BaseController.java

@@ -46,7 +46,7 @@ public abstract class BaseController {
         String token = request.getHeader("token");
         String json = stringRedisTemplate.opsForValue().get(token);
         if (StringUtils.isBlank(json)){
-            throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
+            return null;
         }
         LoginSuccessDTO loginSuccessDTO = JSONObject.parseObject(json, LoginSuccessDTO.class);
         return loginSuccessDTO;

release-service/src/main/java/com/mmc/csf/release/controller/TenderController.java

@@ -126,7 +126,7 @@ public class TenderController extends BaseController{
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppTenderInfoDTO.class)})
     @PostMapping(value = "listNewTenderInfo")
     public ResultBody listNewTenderInfo(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO, HttpServletRequest request){
-        return tenderService.listNewTenderInfo(industryCaseQO, this.getUserLoginInfoFromRedis(request).getUserAccountId());
+        return tenderService.listNewTenderInfo(industryCaseQO, this.getUserLoginInfoFromRedis(request));
     }
 
 }

release-service/src/main/java/com/mmc/csf/release/service/TenderService.java

@@ -4,6 +4,7 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.TenderApplyVO;
 import com.mmc.csf.infomation.vo.TenderNewsVO;
+import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -36,5 +37,6 @@ public interface TenderService {
 
     ResultBody listTenderInfoAppLatest(Integer pageNo, Integer pageSize, Integer userAccountId);
 
-    ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO, Integer userAccountId);
+    ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO,
+                                 LoginSuccessDTO loginSuccessDTO);
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/TenderServiceImpl.java

@@ -7,6 +7,7 @@ import com.mmc.csf.infomation.dto.*;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.TenderApplyVO;
 import com.mmc.csf.infomation.vo.TenderNewsVO;
+import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import com.mmc.csf.release.dao.TenderDao;
 import com.mmc.csf.release.entity.TenderApplyDO;
 import com.mmc.csf.release.entity.TenderInfoDO;
@@ -272,7 +273,8 @@ public class TenderServiceImpl implements TenderService {
     }
 
     @Override
-    public ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO, Integer userAccountId) {
+    public ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO,
+                                        LoginSuccessDTO loginSuccessDTO) {
         //查询对应地区的用户， 默认查广东
         industryCaseQO.setProvinceCode(industryCaseQO.getProvinceCode() == null  ? 440000 : industryCaseQO.getProvinceCode());
         List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode() , industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
@@ -288,17 +290,18 @@ public class TenderServiceImpl implements TenderService {
         List<AppTenderInfoDTO> pageList = list.stream().map(d -> {
             return d.buildAppTenderInfoDTO();
         }).collect(Collectors.toList());
-
-        //查出已申请过的并做标记
-        List<Integer> applyTenderInfoIds = tenderDao.listApplyTenderInfoIds(tenderInfoIds, userAccountId);
-        if (CollectionUtils.isNotEmpty(applyTenderInfoIds)) {
-            pageList.forEach(d->{
-                if(applyTenderInfoIds.contains(d.getId())){
-                    d.setApply(1);
-                }else {
-                    d.setApply(0);
-                }
-            });
+        if (loginSuccessDTO != null) {
+            //查出已申请过的并做标记
+            List<Integer> applyTenderInfoIds = tenderDao.listApplyTenderInfoIds(tenderInfoIds, loginSuccessDTO.getUserAccountId());
+            if (CollectionUtils.isNotEmpty(applyTenderInfoIds)) {
+                pageList.forEach(d->{
+                    if(applyTenderInfoIds.contains(d.getId())){
+                        d.setApply(1);
+                    }else {
+                        d.setApply(0);
+                    }
+                });
+            }
         }
         return ResultBody.success(PageResult.buildPage(pageNo, industryCaseQO.getPageSize(), count, pageList));
     }