bug修复

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课件管理-查询.sql

@@ -1,3 +1,3 @@
 SELECT t1.*
 FROM sat_courseware t1
-where $where$
+where $where$ and t1.siteid=$siteid$

src/custom/restcontroller/webmanage/saletool/courseware/courseware.java

@@ -220,6 +220,7 @@ public class courseware extends Controller {
 
         SQLFactory sqlFactory = new SQLFactory(this, "课件管理-查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);
+        sqlFactory.addParameter_SQL("siteid", siteid);
         String sql = sqlFactory.getSQL();
         Rows rows = dbConnect.runSqlQuery(sql);
 

src/custom/restcontroller/webmanage/saletool/store/StoreAgent.java

@@ -113,7 +113,7 @@ public class StoreAgent extends Controller {
             sqlFactory.insert();
 
             content.put("sa_storeid", sa_storeid);
-        }else {
+        } else {
             UpdateSQL sqlFactory = SQLFactory.createUpdateSQL(controller, sa_store);
             sqlFactory.setSiteid(siteid);
             sqlFactory.setUniqueid(sa_storeid);
@@ -373,16 +373,17 @@ public class StoreAgent extends Controller {
         Long sa_storeid = content.getLongValue("sa_storeid");
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sys_enterprise_hr"
-                        , "sys_enterprise_hrid", "name", "position", "phonenumber", "isleader", "userid","createby","createdate","changeby","changedate")
+                        , "sys_enterprise_hrid", "name", "position", "phonenumber", "isleader", "userid", "createby", "createdate", "changeby", "changedate")
                 .setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_store_hr", "t2", "t2.sys_enterprise_hrid=t1.sys_enterprise_hrid and t2.siteid=t1.siteid"
                 , "sa_store_hrid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_users", "t3", "t3.userid=t1.userid "
                 , "accountno");
-        querySQL.addJoinTable(JOINTYPE.left,"sys_userrole","t4","t4.userid=t1.userid and t4.siteid=t1.siteid");
-        querySQL.addJoinTable(JOINTYPE.left,"sys_role","t5","t5.roleid=t4.roleid and t5.siteid=t4.siteid and t5.rolename='"+ Parameter.get("storerolename") +"'");
-        querySQL.addQueryFields("status","case when t5.roleid >0 then '启用' else '停用' end");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_userrole", "t4", "t4.userid=t1.userid and t4.siteid=t1.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_role", "t5", "t5.roleid=t4.roleid and t5.siteid=t4.siteid and t5.rolename='" + Parameter.get("storerolename") + "'");
+        querySQL.addQueryFields("status", "case when t5.roleid >0 then '启用' else '停用' end");
         querySQL.setSiteid(siteid);
+        querySQL.setWhere(where.toString());
         querySQL.setWhere("t2.sa_storeid", sa_storeid);
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
         Rows rows = querySQL.query();
@@ -400,8 +401,8 @@ public class StoreAgent extends Controller {
             Rows storeRows = storeRowsMap.getOrDefault(row.getString("sys_enterprise_hrid"), new Rows());
             row.put("storenames", String.join(",", storeRows.toArrayList("storename")));
 
-            row.putIfAbsent("createdate","");
-            row.putIfAbsent("changedate","");
+            row.putIfAbsent("createdate", "");
+            row.putIfAbsent("changedate", "");
         }