commit

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingDelegationApproval.java

@@ -107,7 +107,7 @@ public class MeetingDelegationApproval {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or("mi.name", "like", "%" + pageForm.getSearchKeyword() + "%");
 			seg.or("mi.address", "like", "%" + pageForm.getSearchKeyword() + "%");
-			seg.or("info.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("mtp.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
 			cnd.and(seg);
 		}
 		if(year != null) {
@@ -116,7 +116,7 @@ public class MeetingDelegationApproval {
 			cnd.and("ins.createdAt", ">=", startTime);
 			cnd.and("ins.createdAt", "<=", endTime);
 		}
-		cnd.andEX("mi.type", "=", type);
+		cnd.andEX("mi.typeId", "=", type);
 
 		cnd.and("t.taskName", "=", "e0ef2404-7468-480a-97b6-b918e0a9232f");
 		cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java

@@ -111,12 +111,12 @@ public class MeetingLeaveController {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or("mi.name", "like", "%" + pageForm.getSearchKeyword() + "%");
 			seg.or("mi.address", "like", "%" + pageForm.getSearchKeyword() + "%");
-			seg.or("info.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("mtp.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
 			cnd.and(seg);
 		}
 		cnd.and("info.userId", "=", SecurityUtil.getUserId());
 		cnd.and("ins.id", "is not", null);
-		cnd.andEX("mi.type", "=", type);
+		cnd.andEX("mi.typeId", "=", type);
 		if(year != null) {
 			long startTime = DateUtil.parse(year + "-01-01").getTime();
 			long endTime = DateUtil.parse(year + "-12-31").getTime();

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingSchoolUnionApproval.java

@@ -38,7 +38,7 @@ import java.util.List;
 @Slf4j
 @IocBean
 @Ok("json:full")
-@Api(tags = "会议请假团长审核")
+@Api(tags = "会议请假校工会审核")
 @At("/platform/meeting/schoolUnionApproval")
 public class MeetingSchoolUnionApproval {
 
@@ -106,7 +106,7 @@ public class MeetingSchoolUnionApproval {
 			SqlExpressionGroup seg = new SqlExpressionGroup();
 			seg.or("mi.name", "like", "%" + pageForm.getSearchKeyword() + "%");
 			seg.or("mi.address", "like", "%" + pageForm.getSearchKeyword() + "%");
-			seg.or("info.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("mtp.periodName", "like", "%" + pageForm.getSearchKeyword() + "%");
 			cnd.and(seg);
 		}
 		if(year != null) {
@@ -115,7 +115,7 @@ public class MeetingSchoolUnionApproval {
 			cnd.and("ins.createdAt", ">=", startTime);
 			cnd.and("ins.createdAt", "<=", endTime);
 		}
-		cnd.andEX("mi.type", "=", type);
+		cnd.andEX("mi.typeId", "=", type);
 
 		cnd.and("t.taskName", "=", "e28e9ab0-5546-4d97-9939-47df088f38ab");
 		cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -119,6 +119,8 @@ public class MeetingInfoServiceImpl extends BaseServiceImpl<MeetingInfo> impleme
 		if (!newRelations.isEmpty()) {
 			dao().insert(newRelations);
 		}
+
+		dao().updateIgnoreNull(info);
 	}
 
 	private MeetingTimePeriodUser buildRelation(String meetingId, String periodId, MeetingTimePeriodUser user) {

src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffbenefit.contribution.controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -88,7 +89,7 @@ public class ContributionTypeController {
 
 	@At
 	@ApiOperation("查询慈善捐助专题")
-	@SaCheckPermission("contribution")
+	@SaCheckLogin
 	public Result queryContributionType() {
 		List<ContributionType> list = typeService.query(Cnd.NEW().desc(ContributionType::getTypeCode));
 		return Result.success(list);
@@ -96,7 +97,7 @@ public class ContributionTypeController {
 
 	@At
 	@ApiOperation("查询单个慈善捐助专题")
-	@SaCheckPermission("contribution")
+	@SaCheckLogin
 	public Result fetchOne(String id) {
 		ContributionType type = typeService.fetch(id);
 		List<ContributionProject> list = dao.query(ContributionProject.class, Cnd.where(ContributionProject::getContributionTypeCode, "=", type.getTypeCode()).and(ContributionProject::getIsContributionEnable, "=", true));

src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionListController.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffbenefit.contribution.h5Controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -95,7 +96,7 @@ public class H5ContributionListController {
 
 	@At
 	@ApiOperation("查询单个慈善捐助专题")
-	@SaCheckPermission("contribution")
+	@SaCheckLogin
 	public Result fetchOne(String id) {
 		Sql sql = Sqls.create("""
                 SELECT