From 02d232383466b044467b2882feae1b1aec7e4691 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 30 Sep 2025 16:02:12 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BirthdayWishesPlanController.java | 8 +++++- .../controller/HuiminManageController.java | 8 +++--- .../controller/HuiminMineController.java | 26 ++++++++++++++++--- .../maternityLeave/mine/index.html | 2 +- .../activity/workscollection/mine/info.js | 3 --- 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/birthdayWishes/controller/BirthdayWishesPlanController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/birthdayWishes/controller/BirthdayWishesPlanController.java index c0df1fbd..4a62ebef 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/birthdayWishes/controller/BirthdayWishesPlanController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/birthdayWishes/controller/BirthdayWishesPlanController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.dayofficework.birthdayWishes.controller; 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; @@ -9,6 +10,7 @@ import com.budwk.app.sys.services.SysTaskService; import com.budwk.app.task.services.TaskPlatformService; import com.budwk.app.zhgh.dayofficework.birthdayWishes.models.BirthdayWishesPlan; import com.budwk.app.zhgh.dayofficework.birthdayWishes.service.BirthdayWishesService; +import com.budwk.app.zhgh.dayofficework.cadreTraining.model.CadreTrainingAct; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; @@ -47,12 +49,16 @@ public class BirthdayWishesPlanController { @At @Ok("json:full") @SaCheckPermission("birthdayWishes") - public Result pageData(PageForm pageForm) { + public Result pageData(PageForm pageForm, @Param("name") String name) { Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + cnd.and(Cnd.likeEX("name", pageForm.getSearchKeyword())); + } Pagination pagination = birthdayWishesService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); return Result.success(pagination); } + @At @Aop(TransAop.READ_COMMITTED) @ApiOperation("添加计划") diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java index e77cde3e..ab42d9b2 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java @@ -6,6 +6,7 @@ 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.web.commons.auth.utils.SecurityUtil; 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; @@ -56,10 +57,11 @@ public class HuiminManageController { $condition """); Cnd cnd = Cnd.NEW(); - if(StrUtil.isNotBlank(pageForm.getSearchKeyword())){ - cnd.where().andLike("t1.title", "%" + pageForm.getSearchKeyword() + "%"); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + cnd.and("t1.title", "like", "%" + pageForm.getSearchKeyword() + "%"); } - cnd.and(Cnd.exps("aus.groupId","is not",null).or("t1.groupId","is",null)); + //cnd.and(Cnd.exps("t1.groupId", "is", null).or("aus.groupId", "is not", null)); + //sql.params().set("userId", SecurityUtil.getUserId()); sql.setCondition(cnd); Pagination pagination = huiminService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java index ddc25025..cb18bf12 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java @@ -6,11 +6,14 @@ 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.web.commons.auth.utils.SecurityUtil; 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; 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; @@ -42,13 +45,30 @@ public class HuiminMineController { @At @SaCheckPermission(value = {"huimin.mine", "h5.huimin.mine"}, mode = SaMode.OR) 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()); + // 添加搜索关键字过滤 + if(StrUtil.isNotBlank(pageForm.getSearchKeyword())){ + cnd.and("t1.title", "like", "%" + pageForm.getSearchKeyword() + "%"); } - Pagination pagination = huiminService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); + // 添加启用状态过滤（只显示启用的记录） + cnd.and("t1.enable", "=", true); + // 添加权限过滤 + cnd.and(Cnd.exps("t1.groupId", "is", null).or("aus.groupId", "is not", null)); + sql.params().set("userId", SecurityUtil.getUserId()); + sql.setCondition(cnd); + Pagination pagination = huiminService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); } + } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html index 78eb2682..73e02a59 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html @@ -21,7 +21,7 @@ layout("/layouts/platform.html"){ - · +