..

src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvController.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.dayofficework.qsv.h5controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
@@ -23,13 +24,14 @@ public class H5QsvController {
     private QsvActivityService qsvActivityService;
 
     @At("")
-    @Ok("beetl:/mobile/qsv/index.html")
+    @Ok("beetl:/platform/zhghh5/dayofficework/qsv/index.html")
+    @SaCheckLogin
     public void index() {
 
     }
 
-//    分页查询
     @At
+    @SaCheckLogin
     public Result pageData(@Valid PageForm pageForm, @Valid String category) {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("category", "=", category);

src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvQuizController.java

@@ -1,7 +1,9 @@
 package com.budwk.app.zhgh.dayofficework.qsv.h5controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.result.Result;
@@ -44,26 +46,30 @@ public class H5QsvQuizController {
     private QsvQuizService qsvQuizService;
 
     @At("")
-    @Ok("beetl:/mobile/qsv/quiz/index.html")
+    @SaCheckLogin
+    @Ok("beetl:/platform/zhghh5/dayofficework/qsv/quiz/index.html")
     public void index() {
 
     }
 
     @At
-    @Ok("beetl:/mobile/qsv/quiz/result.html")
+    @SaCheckLogin
+    @Ok("beetl:/platform/zhghh5/dayofficework/qsv/quiz/result.html")
     public void result() {
 
     }
 
-//    题目列表
     @At
+    @SaCheckLogin
     public Result subjects(@Valid String activityId) {
         QsvActivity activity = dao.fetch(QsvActivity.class, activityId);
 
-        int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getGroupId())
-                .and("userId", "=", SecurityUtil.getUserId()));
-        if (count != 1) {
-            return Result.error("您无需参加此次答题，感谢您的关注！");
+        if(activity.getGroupId() != null){
+            int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getGroupId())
+                    .and("userId", "=", SecurityUtil.getUserId()));
+            if (count != 1) {
+                return Result.error("您无需参加此次答题，感谢您的关注！");
+            }
         }
 
         String mode = activity.getMode();

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java

@@ -46,6 +46,13 @@ public class ProposalFeedbackEvaluationController {
     public void index() {
     }
 
+    @At(value = "/platform/h5/proposal/feedbackEvaluation",top = true)
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html")
+    @SaCheckPermission("proposal.feedbackEvaluation")
+    public void h5Index() {
+    }
+
+
     @At
     @SaCheckPermission("proposal.feedbackEvaluation")
     @ApiOperation("分页列表")

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java

@@ -49,6 +49,14 @@ public class ProposalSchoolLeaderApprovalController {
     public void index() {
     }
 
+
+    @At(value = "/platform/h5/proposal/schoolLeaderApproval",top = true)
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html")
+    @SaCheckPermission("proposal.schoolLeaderApproval")
+    public void h5Index() {
+    }
+
+
     @At
     @SaCheckPermission("proposal.schoolLeaderApproval")
     @ApiOperation("分页列表")

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java

@@ -44,17 +44,17 @@ public class SuggestionBoxMineController {
 
     }
 
-    @At(value = "/platform/h5/suggestionBox/mine",top = true)
+    @At(value = "/platform/h5/suggestionBox/mine", top = true)
     @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/mine/index.html")
     @SaCheckLogin
-    public void h5Index(){
+    public void h5Index() {
 
     }
 
 
     @At
     @SaCheckPermission("suggestionBox.mine")
-    public Result pageData(Integer pageNumber, Integer pageSize, String title, Integer year) {
+    public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.id,
@@ -89,8 +89,8 @@ public class SuggestionBoxMineController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
-        if (StrUtil.isNotBlank(title)) {
-            cnd.where().andLike("info.title", title);
+        if (StrUtil.isNotBlank(searchKeyword)) {
+            cnd.where().andLike("info.title", searchKeyword);
         }
         cnd.andEX("YEAR(info.submitTime)", "=", year);
         cnd.desc("info.submitTime");

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java

@@ -1,10 +1,11 @@
 package com.budwk.app.zhgh.democratic.suggestionBox.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.engine.FlowEngine;
-import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.democratic.suggestionBox.service.SuggestionBoxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,15 +37,22 @@ public class SuggestionBoxQueryController {
 
     @At("")
     @Ok("beetl:/platform/zhgh/democratic/suggestionBox/query/index.html")
-    @SaCheckLogin
+    @SaCheckPermission("suggestionBox.query")
     public void index() {
 
     }
 
+    @At(value = "/platform/h5/suggestionBox/query", top = true)
+    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/query/index.html")
+    @SaCheckPermission("suggestionBox.query")
+    public void h5Index() {
+
+    }
+
 
     @At
-    @SaCheckLogin
-    public Result pageData(Integer pageNumber, Integer pageSize, String title, Integer year) {
+    @SaCheckPermission("suggestionBox.query")
+    public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.id,
@@ -79,7 +87,9 @@ public class SuggestionBoxQueryController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("YEAR(info.submitTime)", "=", year);
-        cnd.and(Cnd.likeEX("info.title", title));
+        if (StrUtil.isNotBlank(searchKeyword)) {
+            cnd.where().andLike("info.title", searchKeyword);
+        }
         cnd.desc("info.submitTime");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = suggestionBoxService.listPageMap(pageNumber, pageSize, sql);

src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.suggestionBox.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
@@ -35,14 +36,22 @@ public class SuggestionXghController {
 
     @At("")
     @Ok("beetl:/platform/zhgh/democratic/suggestionBox/xgh/index.html")
-    @SaCheckLogin
+    @SaCheckPermission("suggestionBox.xgh")
     public void index() {
 
     }
 
+    @At(value = "/platform/h5/suggestionBox/xgh",top = true)
+    @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/xgh/index.html")
+    @SaCheckPermission("suggestionBox.xgh")
+    public void h5Index() {
+
+    }
+
+
     @At
-    @SaCheckLogin
-    public Result pageData(PageForm pageForm, String taskId, String title, Integer year, boolean approval) {
+    @SaCheckPermission("suggestionBox.xgh")
+    public Result pageData(PageForm pageForm, String taskId, String searchKeyword, Integer year, boolean approval) {
         Sql sql = Sqls.create("""
                 SELECT
                   info.id,
@@ -88,7 +97,10 @@ public class SuggestionXghController {
         }
 
         cnd.andEX("YEAR(info.submitTime)", "=", year);
-        cnd.and(Cnd.likeEX("info.title", title));
+
+        if (StrUtil.isNotBlank(searchKeyword)) {
+            cnd.where().andLike("info.title", searchKeyword);
+        }
 
         if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
             cnd.desc("info.submitTime");
@@ -103,7 +115,7 @@ public class SuggestionXghController {
     }
 
     @At
-    @SaCheckLogin
+    @SaCheckPermission("suggestionBox.xgh")
     @ApiOperation("查询任务")
     public Result queryTask(@Valid @Param("taskId") String taskId) {
         Sql sql = Sqls.create("""