fixed

src/main/java/cn/cslg/pas/service/business/ProductService.java

@@ -463,10 +463,8 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
         for (ProductVO productVO : productVOS) {
             //装载人员信息
             Personnel personnel = personnels.stream().filter(item -> item.getId().toString().equals(productVO.getCreateId())).findFirst().orElse(null);
-            if (personnel != null) {
+            if (ObjectUtils.isNotEmpty(personnel)) {
                 productVO.setCreateName(personnel.getPersonnelName());
-            } else {
-                throw new XiaoShiException("未获取到当前登陆人信息");
             }
             //装载文件信息
             List<AssoProductFile> assoProductFilesTemp = assoProductFiles.stream().filter(item -> item.getProductId().equals(productVO.getId())).collect(Collectors.toList());
@@ -517,7 +515,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
             adminWrapper.eq(AssoProductPerson::getRole, 0);
             List<AssoProductPerson> assoProductPeople = assoProductPersonService.list(adminWrapper);
             List<String> adminIds = assoProductPeople.stream().map(AssoProductPerson::getPersonId).collect(Collectors.toList());
-            adminIds.remove(personnel.getId().toString());
+            if (ObjectUtils.isNotEmpty(personnel)) {
+                adminIds.remove(personnel.getId());
+            }
             //根据管理员人员ids查询名称
             String res = permissionService.getPersonnelByIdsFromPCS(adminIds);
             JSONObject jsonObject = JSONObject.parseObject(res);

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -11,6 +11,7 @@ import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.utils.parseQueryToTree.*;
 import cn.cslg.pas.common.vo.EsConfigVO;
 import cn.cslg.pas.exception.ConditionException;
+import cn.cslg.pas.exception.ExceptionEnum;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.EsBuilderFactory.EsBuilderFactory;
 import cn.cslg.pas.factorys.EsBuilderFactory.IQueryBuilder;
@@ -275,7 +276,7 @@ public class FormatQueryService {
                 //格式化检索式
                 sql1 = this.ToString2((operateNode) tree, null, tableName);
             } catch (Exception e) {
-                throw new ConditionException("检索式错误");
+                throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "检索式错误");
             }
         }