|
|
@@ -366,6 +366,7 @@ public class role extends Controller {
|
|
|
querySQL.setWhere("ifnull(t1.siteid, '') = '' or t1.siteid = '" + siteid + "'");
|
|
|
querySQL.setWhere("t1.isused", true);
|
|
|
querySQL.setWhere("t1.sys_reportid", Op.NOT_IN, sys_reportid);
|
|
|
+ querySQL.setPage(pageSize, pageNumber);
|
|
|
Rows rows = querySQL.query();
|
|
|
return getSucReturnObject().setData(rows).toString();
|
|
|
}
|
|
|
@@ -379,6 +380,7 @@ public class role extends Controller {
|
|
|
querySQL.setWhere("t1.roleid", roleid);
|
|
|
querySQL.setWhere("ifnull(t2.siteid, '') = '' or t2.siteid = '" + siteid + "'");
|
|
|
querySQL.setWhere("t2.isused", true);
|
|
|
+ querySQL.setPage(pageSize, pageNumber);
|
|
|
Rows rows = querySQL.query();
|
|
|
return getSucReturnObject().setData(rows).toString();
|
|
|
}
|