Merge remote-tracking branch 'origin/develop-yellow' into develop2

src/custom/restcontroller/webmanage/saletool/sharematerial/DesignPic.java

@@ -338,20 +338,19 @@ public class DesignPic extends Controller {
 
             }
 
-            if (whereObject.containsKey("isnationwide") && !"".equals(whereObject.getString("isnationwide"))) {
-                where.append(" and (");
-                where.append("t1.isnationwide ='").append(whereObject.getString("isnationwide")).append("' ");
-                where.append(")");
-            }
-
 
         }
 
-
-        if (usertype == 21 || usertype == 22) {
+        if (content.getLongValue("isnationwide") == 1) {
             where.append(" and (");
-            where.append("t1.sys_enterpriseid ='" + sys_enterpriseid + "' ");
+            where.append("t1.isnationwide ='").append(content.getString("isnationwide")).append("' ");
             where.append(")");
+        } else {
+            if (usertype == 21 || usertype == 22) {
+                where.append(" and (");
+                where.append("t1.sys_enterpriseid ='" + sys_enterpriseid + "' ");
+                where.append(")");
+            }
         }
 
 
@@ -366,6 +365,7 @@ public class DesignPic extends Controller {
         querySQL.addQueryFields("islike", "CASE WHEN t4.sys_datacollectid>0 THEN 1 ELSE 0 END");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("classid", 5);
+        querySQL.setWhere("status='发布'");
         querySQL.setWhere(where.toString());
         querySQL.setOrderBy(pageSorting).setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();