2/26

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

@@ -77,7 +77,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         List<String> sqls = formatQueryService.reSqls(queryRequest,"productCategory");
-        sqls =this.loadSearchSql(sqls);
+        sqls = this.loadSearchSql(sqls);
         //根据sql查询产品类别信息
         List<ProductCategoryVO> productCategoryVOS = productCategoryMapper.getProductCategory(sqls.get(0),sqls.get(1),sqls.get(2));
         //查询总数
@@ -524,9 +524,9 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         }
 
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
-            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+            sqls.set(0, "("+rootSql+")" + " and" + "(" + sqls.get(0) + ")");
         } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
-            sqls.set(0, rootSql);
+            sqls.set(0, "("+rootSql+")");
         }
 
 

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

@@ -559,9 +559,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
         }
 
         if (sqls.get(0) != null && !sqls.get(0).equals("") && !rootSql.equals("")) {
-            sqls.set(0, rootSql + " and" + "(" + sqls.get(0) + ")");
+            sqls.set(0, "("+rootSql+")" + " and" + "(" + sqls.get(0) + ")");
         } else if ((sqls.get(0) == null || sqls.get(0).equals("")) && !rootSql.equals("")) {
-            sqls.set(0, rootSql);
+            sqls.set(0, "("+rootSql+")");
         }
 
         return sqls;