..

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

@@ -6,18 +6,24 @@ 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.dayofficework.message.service.GlobalMessageSendService;
 import com.budwk.app.zhgh.staffbenefit.huimin.models.Huimin;
 import com.budwk.app.zhgh.staffbenefit.huimin.service.HuiminService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import java.util.Arrays;
+import java.util.List;
+
 @IocBean
 @At("/platform/huimin/manage")
 @Api(("惠民服务管理"))
@@ -28,6 +34,9 @@ public class HuiminManageController {
     @Inject
     private HuiminService huiminService;
 
+    @Inject
+    private GlobalMessageSendService globalMessageSendService;
+
     @At("")
     @SaCheckPermission("huimin.manage")
     @Ok("beetl:/platform/zhgh/staffbenefit/huimin/manage/index.html")
@@ -37,11 +46,30 @@ public class HuiminManageController {
     @At
     @SaCheckPermission("huimin.manage")
     public Result pageData(PageForm pageForm) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  t1.*
+                FROM
+                  huimin t1
+                  LEFT JOIN activity_user_scope aus ON t1.groupId = aus.groupId
+                  AND aus.userId = @userId
+                $condition
+                """);
         Cnd cnd = Cnd.NEW();
         if(StrUtil.isNotBlank(pageForm.getSearchKeyword())){
-            cnd.where().andLike(Huimin::getTitle, pageForm.getSearchKeyword());
+            cnd.where().andLike("t1.title", "%" + pageForm.getSearchKeyword() + "%");
         }
-        Pagination pagination = huiminService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
+        cnd.and(Cnd.exps("aus.groupId","is not",null).or("t1.groupId","is",null));
+        sql.setCondition(cnd);
+        Pagination pagination = huiminService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+
+        String title = "审批待办";
+        String content = "您有一个新的审批任务需要处理，请及时登录系统查看。";
+        List<String> receiverIds = Arrays.asList("00198c31ee094466845979ab8dabf83b", "00266dbf9e014376ab76072851b1a8ac");
+
+        // 自动发送到所有启用的渠道
+        globalMessageSendService.sendMessage(title, content, 2, receiverIds, null);
+
         return Result.success(pagination);
     }