|
@@ -329,17 +329,23 @@ public class DesignPic extends Controller {
|
|
|
|
|
|
}
|
|
|
|
|
|
- if (whereObject.containsKey("spec") && !"".equals(whereObject.getString("spec"))) {
|
|
|
+ if (whereObject.containsKey("isnationwide") && !"".equals(whereObject.getString("isnationwide"))) {
|
|
|
where.append(" and (");
|
|
|
- where.append("JSON_CONTAINS(t1.renderingsclass->'$.spec', '\"" + whereObject.getString("spec") + "\"')");
|
|
|
+ where.append("t1.isnationwide ='").append(whereObject.getString("isnationwide")).append("' ");
|
|
|
where.append(")");
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
+ if (usertype == 21 || usertype == 22) {
|
|
|
+ where.append(" and (");
|
|
|
+ where.append("t1.sys_enterpriseid ='" + sys_enterpriseid + "' ");
|
|
|
+ where.append(")");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, sat_sharematerial,
|
|
|
"sat_sharematerialid", "title", "title_c", "commentcount", "likecount", "collectcount", "createuserid", "createby", "createdate")
|
|
|
.setTableAlias("t1");
|