营销分类查询调整

src/custom/restcontroller/webmanage/sale/itemclass/itemclass.java

@@ -184,9 +184,9 @@ public class itemclass extends Controller {
     public String queryItemclassAuth() throws YosException {
         long sa_brandid = content.getLongValue("sa_brandid");
         // long istool = content.getLongValue("istool");
-        if (content.containsKey("sys_enterpriseid")) {
-            sys_enterpriseid = content.getLongValue("sys_enterpriseid");
-        }
+//        if (content.containsKey("sys_enterpriseid")) {
+//            sys_enterpriseid = content.getLongValue("sys_enterpriseid");
+//        }
         /*
          * 过滤条件设置
          */
@@ -217,7 +217,7 @@ public class itemclass extends Controller {
                 /*
                  * 查询所有分类
                  */
-                if (sys_enterpriseid > 0) {
+//                if (sys_enterpriseid > 0) {
                     Row enterpriseRow = Enterprise.getEnterprise(this, sys_enterpriseid);
                     if (!enterpriseRow.isEmpty()) {
                         boolean saleclassauth = enterpriseRow.getBoolean("saleclassauth");
@@ -227,15 +227,15 @@ public class itemclass extends Controller {
                                     + sys_enterpriseid + " and siteid='" + siteid + "')";
                         }
                     }
-                }
-                if(sys_enterpriseid==0){
-                    if (Parameter.get(siteid, "isitemclass").equals("1") && userInfo.isSaler()) {
-                        ArrayList<Long> saleItemclassids = ItemClass.getSaleItemclass(this);
-                        if (saleItemclassids.size() > 0) {
-                            where = where + " and t1.itemclassid in (" + StringUtils.join(saleItemclassids, ",") + ") and siteid='" + siteid + "'";
-                        }
-                    }
-                }
+//                }
+//                if(sys_enterpriseid==0){
+//                    if (Parameter.get(siteid, "isitemclass").equals("1") && userInfo.isSaler()) {
+//                        ArrayList<Long> saleItemclassids = ItemClass.getSaleItemclass(this);
+//                        if (saleItemclassids.size() > 0) {
+//                            where = where + " and t1.itemclassid in (" + StringUtils.join(saleItemclassids, ",") + ") and siteid='" + siteid + "'";
+//                        }
+//                    }
+//                }
 
                 SQLFactory sqlFactory = new SQLFactory(this, "查询所有分类");
                 sqlFactory.addParameter("siteid", siteid);