..
This commit is contained in:
@@ -42,8 +42,8 @@ public class SysV4AppsController {
|
||||
@Ok("json")
|
||||
@SaCheckLogin
|
||||
@ApiOperation("获取应用分类")
|
||||
public Result categories() {
|
||||
List<Sys_module> list = dao.query(Sys_module.class, Cnd.where(Sys_module::getPlatform, "=", "PC").asc(Sys_module::getSortNum));
|
||||
public Result categories(@Param(value = "platform", df = "PC") String platform) {
|
||||
List<Sys_module> list = dao.query(Sys_module.class, Cnd.where(Sys_module::getPlatform, "=", platform).asc(Sys_module::getSortNum));
|
||||
List<Map<String, Object>> categories = list.stream().map(module -> {
|
||||
Map<String, Object> category = new HashMap<>();
|
||||
category.put("id", module.getId());
|
||||
@@ -58,7 +58,7 @@ public class SysV4AppsController {
|
||||
@Ok("json:full")
|
||||
@SaCheckLogin
|
||||
@ApiOperation("获取应用列表")
|
||||
public Result list(@Param("categoryId") String categoryId, @Param("letter") String letter, @Param("keyword") String keyword, HttpServletRequest req) {
|
||||
public Result list(@Param("categoryId") String categoryId, @Param("letter") String letter, @Param("keyword") String keyword, @Param(value = "platform", df = "PC") String platform, HttpServletRequest req) {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
m.id,
|
||||
@@ -77,7 +77,7 @@ public class SysV4AppsController {
|
||||
$condition
|
||||
""");
|
||||
Cnd cnd = Cnd.NEW();
|
||||
cnd.and("m.platform", "=", "PC");
|
||||
cnd.and("m.platform", "=", platform);
|
||||
cnd.and("m.disabled", "=", false);
|
||||
cnd.and(Cnd.exps("m.parentId", "is", null).or("m.parentId", "=", ""));
|
||||
cnd.andEX("m.moduleId", "=", categoryId);
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import org.nutz.mvc.annotation.Ok;
|
||||
public class H5ProposalWriteController {
|
||||
|
||||
@At("")
|
||||
@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/write/index.html")
|
||||
@Ok("beetl:/platform/zhghh5/democratic/proposal/transact/write/index_.html")
|
||||
@SaCheckPermission("h5.proposal.write")
|
||||
public void index() {
|
||||
}
|
||||
|
||||
+7
@@ -46,6 +46,13 @@ public class SuggestionBoxWriteController {
|
||||
|
||||
}
|
||||
|
||||
@At("")
|
||||
@Ok("beetl:/platform/zhghh5/democratic/suggestionBox/write/index.html")
|
||||
@SaCheckPermission("h5.suggestionBox.write")
|
||||
public void h5Index(){
|
||||
|
||||
}
|
||||
|
||||
@At
|
||||
@SaCheckPermission("suggestionBox.write")
|
||||
@ApiOperation("保存申请")
|
||||
|
||||
Reference in New Issue
Block a user