Browse Source

5/27 修改查询问题

lwhhszx 1 năm trước cách đây
mục cha
commit
2358ff8de1

+ 1 - 0
src/main/java/cn/cslg/pas/service/importPatent/GetPatentFromExcelThread.java

@@ -292,6 +292,7 @@ public class GetPatentFromExcelThread extends Thread {
 
         List<String> ipcList = uploadParamsVO.getIpcList();
         String mainIpc = uploadParamsVO.getMainIpc();
+
         //装载IPC分类号
         if (ipcList == null && mainIpc!= null) {
             ipcList=new ArrayList<>();

+ 5 - 1
src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.node.ValueNode;
 import com.google.gson.Gson;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -301,7 +302,9 @@ public class FormatQueryService {
      * @return
      */
     public String webQueryToString(operateNode node, GetSqlObject getSqlObject, String tableName) {
-        operate operate1 = node.getoperate();
+        operate operate1 =new operate();
+        BeanUtils.copyProperties(node.getoperate(),operate1);
+//        operate operate1 =  node.getoperate();
         treeNode Left = node.getLeft();
         treeNode Right = node.getRight();
         String strCode = "";
@@ -352,6 +355,7 @@ public class FormatQueryService {
                 }
             }
         }
+
         if (Right != null) {
             String rightValue = "";
             if ((operate1.gettype() == enuType.Logic || operate1.gettype() == enuType.Assignment) && (Right instanceof operateNode)) {