diff --git a/src/main/java/io/v/nutz/base/utils/Roles.java b/src/main/java/io/v/nutz/base/utils/Roles.java index 08950f7..fe10277 100644 --- a/src/main/java/io/v/nutz/base/utils/Roles.java +++ b/src/main/java/io/v/nutz/base/utils/Roles.java @@ -289,4 +289,9 @@ public interface Roles { * 分工会主席 */ String GH01 = "9c1f19e385914fef82bc35da7c9ded36"; + + /** + * 校工会活动报销管理员 + */ + String SchoolUnionActivityReimburseAdmin = "9426526f497542cb8351e0cac8fc9816"; } diff --git a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java index 5e00124..3f5534f 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java +++ b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java @@ -1,7 +1,10 @@ package io.v.nutz.zhgh.jf.handle.reimbursement; +import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; import io.v.nutz.base.utils.ViResource; +import io.v.nutz.sys.models.Sys_user; +import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.models.User; import io.v.nutz.sys.services.SysLocalProcessService; import io.v.nutz.sys.services.impl.SysLocalProcessServiceImpl; @@ -189,13 +192,16 @@ public enum ReimbursementToHandler { CREATE_SCHOOL_DIRECTOR_TASK() { @Override public void exec(String reimbursementId, NutMap extra) { - //校工会负责人;暂时只有一人、姜学军:1019911404(工号) + List userRoles = dao.query(Sys_user_role.class, Cnd.where("roleId", "=", Roles.SchoolUnionActivityReimburseAdmin)); + List list = userRoles.stream().map(Sys_user_role::getUserId).toList(); + List userList = dao.query(Sys_user.class, Cnd.where("id", "in", list)); + List userLoginNameList = userList.stream().map(Sys_user::getLoginname).toList(); localProcessService.createTask( "activity_reimbursement@" + reimbursementId, "activity_reimbursement_school_director_audit", "校工会负责人审核", ShiroUtil.getUserId(), - List.of("1019911404"), + userLoginNameList, "/platform/jf/reimbursement/schoolDirector", "/platform/jf/reimbursement/schoolDirector", "/platform/jf/reimbursement/schoolDirector", diff --git a/src/main/resources/views/platform/jf/reimbursement/apply.html b/src/main/resources/views/platform/jf/reimbursement/apply.html index f70e02d..5af9b57 100644 --- a/src/main/resources/views/platform/jf/reimbursement/apply.html +++ b/src/main/resources/views/platform/jf/reimbursement/apply.html @@ -77,10 +77,10 @@ layout("/layouts/platform.html"){ 导出报销凭证 - --> + 导出活动参加人员 - + --> @@ -125,10 +125,10 @@ layout("/layouts/platform.html"){ - +