c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
=
2025-09-30 16:02:12 +08:00
parent 3e46682706
commit 02d2323834
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/birthdayWishes/controller/BirthdayWishesPlanController.java
+7 -1
View File
@@ -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("添加计划")
src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminManageController.java
+5 -3
View File
@@ -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);
src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java
+23 -3
View File
@@ -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);
}
}