From 225ea638dd0c4698b8343f2a3d3cf8da6556e2e4 Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Wed, 23 Oct 2024 10:20:32 +0800 Subject: [PATCH 1/3] server_commit --- .../hd/wmhd/mobile/staffActivities.html | 8 ++- .../views/platform/hd/wmhd/zpMange.html | 60 +++++++++++-------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html b/src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html index ccf9500..e1224a8 100644 --- a/src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html +++ b/src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html @@ -654,9 +654,15 @@ const i = this.formData.hdlb_i if (flag === true) { - if (this.fd[i].imgList.length === 0) { + /*if (this.fd[i].imgList.length === 0) { this.$toast.fail("请您选择要上传的作品！") return + }*/ + if (this.chooseLb.isUploadPhoto === true || this.chooseLb.isUploadOther === true || this.chooseLb.isUploadZip === true) { + if (this.fd[i].videoList.length === 0 || this.fd[i].imgList.length === 0 || this.fd[i].zipList.length === 0) { + this.$toast.fail("请您选择要上传的作品！") + return + } } if (!this.fd[i].zplb || !this.fd[i].zpmc || !this.fd[i].zpms) { this.$toast.fail("请您填写完整再提交！") diff --git a/src/main/resources/views/platform/hd/wmhd/zpMange.html b/src/main/resources/views/platform/hd/wmhd/zpMange.html index 666ee19..4762f76 100644 --- a/src/main/resources/views/platform/hd/wmhd/zpMange.html +++ b/src/main/resources/views/platform/hd/wmhd/zpMange.html @@ -761,15 +761,21 @@ layout("/layouts/platform.html"){ let formdata = new FormData(); formdata.append("flag", flag); formdata.append("data", JSON.stringify(this.AddFormData)); - this.picturelist.forEach(val => { - formdata.append("file", val.raw); - }); - this.vadlist.forEach(val => { - formdata.append("file", val.raw); - }); - this.ziplist.forEach(val => { - formdata.append("file", val.raw); - }); + if(this.picturelist && this.picturelist.length > 0) { + this.picturelist.forEach(val => { + formdata.append("file", val.raw); + }); + } + if(this.vadlist && this.vadlist.length > 0) { + this.vadlist.forEach(val => { + formdata.append("file", val.raw); + }); + } + if(this.ziplist && this.ziplist.length > 0) { + this.ziplist.forEach(val => { + formdata.append("file", val.raw); + }); + } $.ajax({ url: "/platform/hd/jzghd/sczp/doSubmit", type: "post", @@ -835,21 +841,27 @@ layout("/layouts/platform.html"){ formdata.append("flag", flag); formdata.append("data", JSON.stringify(this.EditFormData)); formdata.append("readytodelfile", JSON.stringify(this.readytodelfile)); - this.picturelist.forEach(val => { - if (val.status === 'ready') { - formdata.append("file", val.raw); - } - }); - this.vadlist.forEach(val => { - if (val.status === 'ready') { - formdata.append("file", val.raw); - } - }); - this.ziplist.forEach(val => { - if (val.status === 'ready') { - formdata.append("file", val.raw); - } - }); + if(this.picturelist && this.picturelist.length > 0) { + this.picturelist.forEach(val => { + if (val.status === 'ready') { + formdata.append("file", val.raw); + } + }); + } + if(this.vadlist && this.vadlist.length > 0) { + this.vadlist.forEach(val => { + if (val.status === 'ready') { + formdata.append("file", val.raw); + } + }); + } + if(this.ziplist && this.ziplist.length > 0) { + this.ziplist.forEach(val => { + if (val.status === 'ready') { + formdata.append("file", val.raw); + } + }); + } $.ajax({ url: "/platform/hd/jzghd/sczp/doEdit", type: "post", From 3b7ff1a2e732070811316cce609d9f403c766b3c Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Wed, 23 Oct 2024 13:38:07 +0800 Subject: [PATCH 2/3] 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 userRoles = meetingMineService.dao().query(Sys_user_role.class, + Cnd.where("userId", "=", ShiroUtil.getUserId()) + .and("roleId", "=", Roles.DBT_TZ)); + List list = userRoles.stream().map(Sys_user_role::getDbtid).collect(Collectors.toList()); + List 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 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 From 90f088eaff854036f898c2539706032cb8f5aaba Mon Sep 17 00:00:00 2001 From: zhaoxinyu Date: Thu, 24 Oct 2024 18:15:22 +0800 Subject: [PATCH 3/3] server_commit --- src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java b/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java index f6d8857..3b6448e 100644 --- a/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java +++ b/src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java @@ -88,7 +88,7 @@ public class LxyHdTjController { u.unionname, u.unioncode, u.unitname unitname, - u.unitcodev + u.unitcode FROM `lxy_grxx` gr LEFT JOIN lxy_bm bm ON bm.userid = gr.userid