商品档案列表查询新增是否中线蝶阀，以及其他7个字段的过滤

src/rest/openapi/restcontroller/wechatapp/titem/Titem.java

@@ -92,27 +92,29 @@ public class Titem extends Controller {
             if (whereObject.containsKey("fistool") && !"".equals(whereObject.getString("fistool"))) {
                 where = where + " and t1.fistool ='" + whereObject.getString("fistool") + "'";
             }
-//            if (whereObject.containsKey("fvalue8") && whereObject.getBoolean("fvalue8")) {
-//                where = where + " and t1.fvalue8 =1";
-//            }
-//            if (whereObject.containsKey("fvalue7") && !"".equals(whereObject.getString("fvalue7"))) {
-//                where = where + " and t1.fvalue7 ='" + whereObject.getString("fvalue7") + "'";
-//            }
-//            if (whereObject.containsKey("fvalue6") && !"".equals(whereObject.getString("fvalue6"))) {
-//                where = where + " and t1.fvalue6 ='" + whereObject.getString("fvalue6") + "'";
-//            }
-//            if (whereObject.containsKey("fvalue5") && !"".equals(whereObject.getString("fvalue5"))) {
-//                where = where + " and t1.fvalue5 ='" + whereObject.getString("fvalue5") + "'";
-//            }
-//            if (whereObject.containsKey("fvalue4") && !"".equals(whereObject.getString("fvalue4"))) {
-//                where = where + " and t1.fvalue4 ='" + whereObject.getString("fvalue4") + "'";
-//            }
-//            if (whereObject.containsKey("fvalue3") && !"".equals(whereObject.getString("fvalue3"))) {
-//                where = where + " and t1.fvalue3 ='" + whereObject.getString("fvalue3") + "'";
-//            }
-//            if (whereObject.containsKey("fvalue2") && !"".equals(whereObject.getString("fvalue2"))) {
-//                where = where + " and t1.fvalue2 ='" + whereObject.getString("fvalue2") + "'";
-//            }
+
+            if (whereObject.containsKey("fvalue8") && whereObject.getBoolean("fvalue8")) {
+                //如果是中线碟阀
+                where = where + " and t1.fvalue8=1";
+            }
+            if (whereObject.containsKey("fvalue7") && !"".equals(whereObject.getString("fvalue7"))) {
+                where = where + " and t1.fvalue7 ='" + whereObject.getString("fvalue7") + "'";
+            }
+            if (whereObject.containsKey("fvalue6") && !"".equals(whereObject.getString("fvalue6"))) {
+                where = where + " and t1.fvalue6 ='" + whereObject.getString("fvalue6") + "'";
+            }
+            if (whereObject.containsKey("fvalue5") && !"".equals(whereObject.getString("fvalue5"))) {
+                where = where + " and t1.fvalue5 ='" + whereObject.getString("fvalue5") + "'";
+            }
+            if (whereObject.containsKey("fvalue4") && !"".equals(whereObject.getString("fvalue4"))) {
+                where = where + " and t1.fvalue4 ='" + whereObject.getString("fvalue4") + "'";
+            }
+            if (whereObject.containsKey("fvalue3") && !"".equals(whereObject.getString("fvalue3"))) {
+                where = where + " and t1.fvalue3 ='" + whereObject.getString("fvalue3") + "'";
+            }
+            if (whereObject.containsKey("fvalue2") && !"".equals(whereObject.getString("fvalue2"))) {
+                where = where + " and t1.fvalue2 ='" + whereObject.getString("fvalue2") + "'";
+            }
         }
         /**
          * SQL货品档案查询参数设置并查询
@@ -921,6 +923,28 @@ public class Titem extends Controller {
             if (whereObject.containsKey("fistool") && !"".equals(whereObject.getString("fistool"))) {
                 where = where + " and t1.fistool ='" + whereObject.getString("fistool") + "'";
             }
+            if (whereObject.containsKey("fvalue8") && whereObject.getBoolean("fvalue8")) {
+                //如果是中线碟阀
+                where = where + " and t1.fvalue8=1";
+            }
+            if (whereObject.containsKey("fvalue7") && !"".equals(whereObject.getString("fvalue7"))) {
+                where = where + " and t1.fvalue7 ='" + whereObject.getString("fvalue7") + "'";
+            }
+            if (whereObject.containsKey("fvalue6") && !"".equals(whereObject.getString("fvalue6"))) {
+                where = where + " and t1.fvalue6 ='" + whereObject.getString("fvalue6") + "'";
+            }
+            if (whereObject.containsKey("fvalue5") && !"".equals(whereObject.getString("fvalue5"))) {
+                where = where + " and t1.fvalue5 ='" + whereObject.getString("fvalue5") + "'";
+            }
+            if (whereObject.containsKey("fvalue4") && !"".equals(whereObject.getString("fvalue4"))) {
+                where = where + " and t1.fvalue4 ='" + whereObject.getString("fvalue4") + "'";
+            }
+            if (whereObject.containsKey("fvalue3") && !"".equals(whereObject.getString("fvalue3"))) {
+                where = where + " and t1.fvalue3 ='" + whereObject.getString("fvalue3") + "'";
+            }
+            if (whereObject.containsKey("fvalue2") && !"".equals(whereObject.getString("fvalue2"))) {
+                where = where + " and t1.fvalue2 ='" + whereObject.getString("fvalue2") + "'";
+            }
         }
         /**
          * SQL货品档案查询参数设置并查询

src/rest/openapi/restcontroller/wechatapp/titemgroup/SQL/商品组查询.sql

@@ -16,6 +16,6 @@ from titemgroup t1
        left join titem t3 on t1.fitemno = t3.fitemno and t1.siteid = t3.siteid
        left join tunit t4 on t3.funitid = t4.funitid and t1.siteid = t4.siteid
 where t1.fisused=1 and t1.siteid=$siteid$ and $where$
-	and (exists( select *from tagentauthors where fagentnum=$fagentnum$ and siteid=t1.siteid and (isnull(fsaleclsnum,'')=isnull(t1.fsaleclsnum,'')))
+	and (exists( select *from tagentauthors where fagentnum=$fagentnum$ and siteid=t1.siteid and (isnull(fsaleclsnum,'')in (select fsaleclsnum from titemgroup_saleclsnum where parentid=t1.titemgroupid)))
 		 or exists(select *from tagents where fagentnum=$fagentnum$ and fagentauthors=1 and siteid=t1.siteid))
 and exists(select * from tagents_field where fieldname=t1.fieldname and siteid=t1.siteid and fagentnum=$fagentnum$)