|
|
|
@ -126,7 +126,7 @@ public class BaseModel {
|
|
|
|
|
sql = "from t_dm_subject order by sort_id";
|
|
|
|
|
subjectPage = Db.paginate(pageNum, pageSize, "select *", sql);
|
|
|
|
|
} else {
|
|
|
|
|
sql = "from t_dm_subject where stage_id="+stage_id+" order by sort_id";
|
|
|
|
|
sql = "from t_dm_subject where stage_id=" + stage_id + " order by sort_id";
|
|
|
|
|
subjectPage = Db.paginate(pageNum, pageSize, "select *", sql);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -317,7 +317,7 @@ public class BaseModel {
|
|
|
|
|
// 递归查找子菜单
|
|
|
|
|
List<Record> childStructure = fetchStructure(scheme_id, structure_id);
|
|
|
|
|
rs.set("children", childStructure);
|
|
|
|
|
rs.set("structure_id",String.valueOf(structure_id));
|
|
|
|
|
rs.set("structure_id", String.valueOf(structure_id));
|
|
|
|
|
res.add(rs);
|
|
|
|
|
}
|
|
|
|
|
return res;
|
|
|
|
|