..

src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java

@@ -1,6 +1,8 @@
 package com.budwk.app.zhgh.staffbenefit.huimin.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;
 import com.budwk.app.base.result.Result;
@@ -27,21 +29,24 @@ public class HuiminManageController {
     private HuiminService huiminService;
 
     @At("")
-    @SaCheckLogin
-    @Ok("beetl:/platform/zhgh/dayofficework/huimin/manage/index.html")
+    @SaCheckPermission("huimin.manage")
+    @Ok("beetl:/platform/zhgh/staffbenefit/huimin/manage/index.html")
     public void index() {
     }
 
     @At
-    @SaCheckLogin
+    @SaCheckPermission("huimin.manage")
     public Result pageData(PageForm pageForm) {
         Cnd cnd = Cnd.NEW();
+        if(StrUtil.isNotBlank(pageForm.getSearchKeyword())){
+            cnd.where().andLike(Huimin::getTitle, pageForm.getSearchKeyword());
+        }
         Pagination pagination = huiminService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
         return Result.success(pagination);
     }
 
     @At
-    @SaCheckLogin
+    @SaCheckPermission("huimin.manage")
     @ApiOperation("新增惠民服务")
     public Result insert(@Param("data") Huimin huimin) {
         huiminService.insert(huimin);
@@ -57,7 +62,7 @@ public class HuiminManageController {
     }
 
     @At
-    @SaCheckLogin
+    @SaCheckPermission("huimin.manage")
     @ApiOperation("删除惠民服务")
     public Result delete(String id) {
         huiminService.delete(id);

src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java

@@ -1,9 +1,12 @@
 package com.budwk.app.zhgh.staffbenefit.huimin.controller;
 
-import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.staffbenefit.huimin.models.Huimin;
 import com.budwk.app.zhgh.staffbenefit.huimin.service.HuiminService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -24,22 +27,25 @@ public class HuiminMineController {
     private HuiminService huiminService;
 
     @At("")
-    @SaCheckLogin
+    @SaCheckPermission("huimin.mine")
     @Ok("beetl:/platform/zhgh/staffbenefit/huimin/mine/index.html")
     public void index() {
     }
 
     @At("/h5")
-    @SaCheckLogin
+    @SaCheckPermission("h5.huimin.mine")
     @Ok("beetl:/platform/zhghh5/staffbenefit/huimin/mine/index.html")
-    public void h5Index(){
+    public void h5Index() {
 
     }
 
     @At
-    @SaCheckLogin
-    public Result pageData(PageForm pageForm){
+    @SaCheckPermission(value = {"huimin.mine", "h5.huimin.mine"}, mode = SaMode.OR)
+    public Result pageData(PageForm pageForm) {
         Cnd cnd = Cnd.NEW();
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.where().andLike(Huimin::getTitle, pageForm.getSearchKeyword());
+        }
         Pagination pagination = huiminService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
         return Result.success(pagination);
     }

src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/models/Huimin.java

@@ -39,4 +39,14 @@ public class Huimin extends BaseModel {
     @Default("1")
     private Boolean enable;
 
+    @Comment("外部链接")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    @Column
+    private String link;
+
+    @Column
+    @ColDefine(type = ColType.INT)
+    @Comment("分组id")
+    private Integer groupId;
+
 }