From cad175061dec07f3f67175bbf6ba82830045bdea Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Tue, 10 Jun 2025 15:23:49 +0800
Subject: [PATCH] 2025/6/10

---
 .../service/impl/ProjectServiceImpl.java       |  1 +
 .../PlmTechnicalSpecificationSheetData.java    | 18 +++++++++---------
 .../TechnicalSpecificationServiceImpl.java     |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
index 4d0110b5..9232e458 100644
--- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java
@@ -424,6 +424,7 @@ public class ProjectServiceImpl implements ProjectService {
         HashMap<String, String> conditionMap = queryCriteriaConstructorDefault.lastConditionalStatement(data);
         String whereClause = conditionMap.get("where");
         String orderClause = conditionMap.get("order");
+        whereClause = (whereClause.isEmpty() ? "a.site = '" + data.getSite() + "'" : whereClause + " AND a.site = '" + data.getSite() + "'").trim();
         String[] whereConditionArr = whereClause.split("AND");
         Map<String, String> symbolMap = new HashMap<>();
         for (QuerySavedDetail detail : data.getQuerySavedDetailList()) {
diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
index 98841e0e..b340ac69 100644
--- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
+++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
@@ -77,12 +77,12 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     private String simplexDuplex;
     private String repeat;
     private String hp;
-    private Integer across;
+    private String across;
     private String printCopyPosition;
     private String labelSize;
     private String vp;
-    private Integer down;
-    private Integer actualNumber;
+    private String down;
+    private String actualNumber;
     private String goodsRollWidth;
     private String newCutter;
     private String dimensionTolerance;
@@ -113,11 +113,11 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
         this.hp = hp;
     }
 
-    public Integer getAcross() {
+    public String getAcross() {
         return across;
     }
 
-    public void setAcross(Integer across) {
+    public void setAcross(String across) {
         this.across = across;
     }
 
@@ -145,19 +145,19 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
         this.vp = vp;
     }
 
-    public Integer getDown() {
+    public String getDown() {
         return down;
     }
 
-    public void setDown(Integer down) {
+    public void setDown(String down) {
         this.down = down;
     }
 
-    public Integer getActualNumber() {
+    public String getActualNumber() {
         return actualNumber;
     }
 
-    public void setActualNumber(Integer actualNumber) {
+    public void setActualNumber(String actualNumber) {
         this.actualNumber = actualNumber;
     }
 
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
index 72e2e527..3d2d3333 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
@@ -2025,6 +2025,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         HashMap<String, String> conditionMap = queryCriteriaConstructorDefault.lastConditionalStatement(querySavedVo);
         String whereClause = conditionMap.get("where");
         String orderClause = conditionMap.get("order");
+        whereClause = (whereClause.isEmpty() ? "a.site = '" + querySavedVo.getSite() + "'" : whereClause + " AND a.site = '" + querySavedVo.getSite() + "'").trim();
         String[] whereConditionArr = whereClause.split("AND");
         Map<String, String> symbolMap = new HashMap<>();
         for (QuerySavedDetail detail : querySavedVo.getQuerySavedDetailList()) {