From 3b7ff1a2e732070811316cce609d9f403c766b3c Mon Sep 17 00:00:00 2001
From: zhaoxinyu <zhaoxinyu0716@gmail.com>
Date: Wed, 23 Oct 2024 13:38:07 +0800
Subject: [PATCH] server_commit

---
 .../mobile/MMeetingMineController.java           | 16 +++++++++++++++-
 .../views/mobile/meeting/myMeeting.html          |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/v/nutz/meeting/controller/mobile/MMeetingMineController.java b/src/main/java/io/v/nutz/meeting/controller/mobile/MMeetingMineController.java
index 17b3d17..63fc51d 100644
--- a/src/main/java/io/v/nutz/meeting/controller/mobile/MMeetingMineController.java
+++ b/src/main/java/io/v/nutz/meeting/controller/mobile/MMeetingMineController.java
@@ -4,11 +4,13 @@ import cn.hutool.core.util.StrUtil;
 import cn.wizzer.framework.base.Result;
 import io.v.nutz.annontation.ViReturn;
 import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.base.utils.Roles;
 import io.v.nutz.base.utils.Vi;
 import io.v.nutz.meeting.models.MeetingInfo;
 import io.v.nutz.meeting.models.MeetingTimePeriodUser;
 import io.v.nutz.meeting.service.MeetingMineService;
 import io.v.nutz.modules.models.PageForm;
+import io.v.nutz.sys.models.Sys_user_role;
 import io.v.nutz.web.commons.utils.ShiroUtil;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.nutz.dao.Chain;
@@ -27,6 +29,7 @@ import org.nutz.mvc.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 会议手机端签到
@@ -139,9 +142,20 @@ public class MMeetingMineController {
             group.orLike("u.loginname", query);
             cnd.and(group);
         }
-        if (!io.v.nutz.util.ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) {
+        if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"}) && ShiroUtil.hasRole("H04")) {
             cnd.and("u.unionid", "=", Vi.getUnionId());
         }
+        if(!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"}) && ShiroUtil.hasRole("jdhdbt01")) {
+            List<Sys_user_role> userRoles = meetingMineService.dao().query(Sys_user_role.class,
+                    Cnd.where("userId", "=", ShiroUtil.getUserId())
+                            .and("roleId", "=", Roles.DBT_TZ));
+            List<String> list = userRoles.stream().map(Sys_user_role::getDbtid).collect(Collectors.toList());
+            List<Sys_user_role> roles = meetingMineService.dao().query(Sys_user_role.class,
+                    Cnd.where("roleId","in", Lang.array(Roles.ZSDB, Roles.LXDB, Roles.TYDB))
+                            .and("dbtid", "in", list));
+            List<String> collect = roles.stream().map(Sys_user_role::getUserId).collect(Collectors.toList());
+            cnd.and("pu.userId", "in", collect);
+        }
         cnd.and("meetingId", "=", meetId);
         cnd.groupBy("pu.userId");
         sql.setCondition(cnd);
diff --git a/src/main/resources/views/mobile/meeting/myMeeting.html b/src/main/resources/views/mobile/meeting/myMeeting.html
index a061e62..87f5d5c 100644
--- a/src/main/resources/views/mobile/meeting/myMeeting.html
+++ b/src/main/resources/views/mobile/meeting/myMeeting.html
@@ -602,7 +602,7 @@ layout("/mobile/platform.html"){
                 if(this.helpLeave) {
                     const confirm = await vant.Dialog.confirm({
                         title: '提示',
-                        message: '您确定要替' + this.needLeaveUser.userName + '报名吗？',
+                        message: '您确定要替' + this.needLeaveUser.userName + '请假吗？',
                     })
                     if (confirm !== 'confirm') {
                         return