From da65274cbb1efd04f3ffec22b7c5e300365929a5 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 30 Dec 2025 18:53:33 +0800 Subject: [PATCH] commit --- .../handler/FlowFghzxAssignmentHandler.java | 7 ++++--- .../ActivityBasicScopeController.java | 2 +- ...rainSignUpActivityStatisticsController.java | 2 +- .../impl/TrainSignUpActivityServiceImpl.java | 18 ++++++++++++++++++ .../impl/SysClubInfoManageServiceImpl.java | 15 +++++++++++++++ .../TeacherCongressDelegationController.java | 3 +++ .../service/impl/SingleTeacherServiceImpl.java | 2 +- .../controller/ThirtyTeachController.java | 2 +- .../club/infoManage/manage/schoolClubManage.js | 4 ++++ .../club/register/apply/clubRegisterManager.js | 2 ++ .../material/approval/index.html | 2 +- .../staffmanage/member/info/group/index.html | 4 +++- .../member/statistics/analysis/index.html | 4 ++-- 13 files changed, 56 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/budwk/app/flow/handler/FlowFghzxAssignmentHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowFghzxAssignmentHandler.java index 879361d..4f60b65 100644 --- a/src/main/java/com/budwk/app/flow/handler/FlowFghzxAssignmentHandler.java +++ b/src/main/java/com/budwk/app/flow/handler/FlowFghzxAssignmentHandler.java @@ -14,6 +14,7 @@ import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; +import org.nutz.lang.Lang; import java.util.List; @@ -27,11 +28,11 @@ public class FlowFghzxAssignmentHandler implements AssignmentHandler { SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class); Sys_role sysRole = sysRoleService.getByCode(RoleConstant.BRANCH_UNION_CHAIRMAN); String unionId = StrUtil.blankToDefault(execution.getArgs().getStr(FlowConst.INITIATOR_UNIT_UNION_ID), SecurityUtil.getUnionId()); - Sys_user_role user_role = dao.fetch(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnionId, "=", unionId)); - if (user_role == null) { + List user_roles = dao.query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnionId, "=", unionId)); + if (Lang.isNotEmpty(user_roles)) { throw new BaseException("分工会主席没有设置，请联系校工会！", sysRole.getCode()); } - return List.of(user_role.getUserId()); + return user_roles.stream().map(Sys_user_role::getUserId).distinct().toList(); } @Override diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index 8269a88..1d78f37 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -92,7 +92,7 @@ public class ActivityBasicScopeController { * @return {@link Result} */ @At - @SaCheckPermission("activity.basic.scope") + @SaCheckPermission("activity.basic") public Result pageData(@Param("data") ActivityUserScopePageParam pageForm) { Sql sql = Sqls.create(""" SELECT diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java index a5099d5..f507631 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java @@ -236,7 +236,7 @@ public class TrainSignUpActivityStatisticsController { for (TrainSignUpCourse c : courseList) { String k = c.getCourseName(); - List v = userList.stream().filter(x -> x.getString("courseName").equals(k)).collect(Collectors.toList()); + List v = userList.stream().filter(x -> StrUtil.isNotBlank(x.getString("courseName")) && x.getString("courseName").equals(k)).collect(Collectors.toList()); ExportParams userExportParams = new ExportParams(); userExportParams.setSheetName(k); userExportParams.setType(ExcelType.HSSF); diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java index 008447b..7de5258 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java @@ -91,6 +91,24 @@ public class TrainSignUpActivityServiceImpl extends BaseServiceImpl newIds = courseList.stream() + .map(TrainSignUpCourse::getId) + .filter(StrUtil::isNotBlank) + .collect(Collectors.toSet()); + + List oldCourses = dao().query(TrainSignUpCourse.class, Cnd.where("activityId", "=", activity.getId())); + + Set oldIds = oldCourses.stream() + .map(TrainSignUpCourse::getId) + .filter(StrUtil::isNotBlank) + .collect(Collectors.toSet()); + + Set deletedIds = Sets.difference(oldIds, newIds).immutableCopy(); + if(Lang.isNotEmpty(deletedIds)) { + dao().clear(TrainSignUpCourse.class, Cnd.where("id", "in", deletedIds)); + } + for (TrainSignUpCourse course : courseList) { course.setActivityId(activity.getId()); dao().insertOrUpdate(course); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java index b5bd6be..37ef5e9 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java @@ -8,11 +8,13 @@ import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.SysOfficeTemplateUtil; import com.budwk.app.bpm.enums.BpmProcessInstanceStatusEnum; import com.budwk.app.flow.enums.ProcessInstanceStateEnum; +import com.budwk.app.sys.models.Sys_user; import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.base.Globals; import com.budwk.app.web.controllers.open.commons.service.CommonService; +import com.budwk.app.zhgh.club.model.ClubUser; import com.budwk.app.zhgh.club.param.ClubUserPageForm; import com.budwk.app.zhgh.club.service.SysClubInfoManageService; import com.budwk.app.zhgh.club.service.SysClubService; @@ -26,6 +28,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -95,6 +98,18 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl userList = dao().query(Sys_user.class, c); + List list = dao().query(ClubUser.class, Cnd.where("userId", "in", userList.stream().map(Sys_user::getId).toList())); + cnd.and("c.id", "in", list.stream().map(ClubUser::getClubId).toList()); + } + cnd.andEX("year(c.createTime)", "=", pageForm.getYear()); cnd.and("c.dismiss", "=", false); cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode()); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java index a4ccda5..fe7a8ba 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java @@ -18,6 +18,7 @@ import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.sys.services.SysUserService; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -147,6 +148,8 @@ public class TeacherCongressDelegationController { @SaCheckPermission("tc.delegation") public Result delete(@Valid String id) { dao.delete(Teacher_congress_delegation.class, id); + dao.clear(Teacher_congress_delegation_union.class, Cnd.where(Teacher_congress_delegation_union::getDelegationId, "=", id)); + dao.clear(Teacher_congress_delegation_unit.class, Cnd.where(Teacher_congress_delegation_unit::getDelegationId, "=", id)); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java index b58a4bd..2451a24 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java @@ -100,7 +100,7 @@ public class SingleTeacherServiceImpl extends BaseServiceImpl imp cnd.andEX("u.personType", "=", pageForm.getPersonType()); cnd.andEX("u.userState", "=", pageForm.getUserState()); cnd.andEX("st.education", "=", pageForm.getEducation()); - cnd.andEX("u.marriage", "=", pageForm.getMarriage()); + cnd.andEX("st.maritalStatus", "=", pageForm.getMarriage()); if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java index 9f51a38..7d176c1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java @@ -194,7 +194,7 @@ public class ThirtyTeachController { break; } - List matchUsers = users.stream().filter(u -> u.getLoginname().equals(temp.getLoginName())).map(u -> { + List matchUsers = users.stream().filter(u -> StrUtil.isNotBlank(u.getLoginname()) && u.getLoginname().equals(temp.getLoginName())).map(u -> { Sys_user user = new Sys_user(); user.setId(u.getId()); user.setLoginname(temp.getLoginName()); diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js index 558e0ed..ca5a65e 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js +++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/schoolClubManage.js @@ -13,6 +13,10 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = { v-model="pageForm.clubName" > + + + diff --git a/src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterManager.js b/src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterManager.js index 80ab050..001e900 100644 --- a/src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterManager.js +++ b/src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterManager.js @@ -58,6 +58,8 @@ const CLUB_MANAGER_TEMPLATE = {