emm

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java

@@ -148,7 +148,7 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
         // 未核酸检测的查询，根据所有企业下登记过的员工，筛出时间段内已检测的，剩下的就是未检测
         if (formDTO.getIsPage()){
             PageInfo<EmployeeRegisterListResultDTO> pageInfo = new PageInfo<>();
-            if (formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){
+            if (StringUtils.isNotBlank(formDTO.getCheckStatus()) && formDTO.getCheckStatus().equals(NumConstant.ZERO_STR)){
                 // 已检测
                 List<EmployeeRegisterListResultDTO> checked = baseDao.employeeRegisterList(formDTO);
                 if (CollectionUtils.isNotEmpty(checked)){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

@@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -608,6 +609,9 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
         List<EnterpriseDetailDTO> list = list(formDTO).getList();
         if (CollectionUtils.isEmpty(list)){
             log.error("根据条件未查询到企事业单位信息，登记码压缩包不能导出！");
+            ServletOutputStream outputStream = response.getOutputStream();
+            outputStream.write("{\"code\":9999,\"msg\":\"未查到企事业单位信息\",\"data\":{}}".getBytes());
+            outputStream.flush();
             return;
         }
         response.reset();