信创页面优化

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/service/impl/XinchuangServiceImpl.java

@@ -5,17 +5,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
 import com.hz.pm.api.projectdeclared.mapper.XinchuangMapper;
-import com.hz.pm.api.projectdeclared.model.entity.Purchase;
 import com.hz.pm.api.projectdeclared.model.entity.Xinchuang;
 import com.hz.pm.api.projectdeclared.model.req.XcfhxListReq;
 import com.hz.pm.api.projectdeclared.model.vo.XcfhxApplyListVO;
 import com.hz.pm.api.projectdeclared.service.IXinchuangService;
 import com.hz.pm.api.projectlib.model.enumeration.status.TenderXcfhxApplyStatus;
-import com.hz.pm.api.user.security.model.UserFullInfoDTO;
-import com.hz.pm.api.user.util.LoginUserUtil;
-import com.ningdatech.basic.model.PageVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -49,7 +44,8 @@ public class XinchuangServiceImpl extends ServiceImpl<XinchuangMapper, Xinchuang
         if (Boolean.TRUE.equals(req.getFinished())) {
             query.eq(Xinchuang::getStatus, TenderXcfhxApplyStatus.XCFHX_APPLY_PASSED.getCode());
         } else if (Boolean.FALSE.equals(req.getFinished())){
-            query.ne(Xinchuang::getStatus, TenderXcfhxApplyStatus.XCFHX_APPLY_PASSED.getCode());
+            query.and(q1 -> q1.ne(Xinchuang::getStatus, TenderXcfhxApplyStatus.XCFHX_APPLY_PASSED.getCode())
+                    .or(q2 -> q2.isNull(Xinchuang::getStatus)));
         }
         List<Xinchuang> list = list(query);
         return list.stream().map(x -> BeanUtil.copyProperties(x,XcfhxApplyListVO.class))