c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2024-10-31 16:36:09 +08:00
parent d11034e86c 90f088eaff
commit f6176e4997
5 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java
+1 -1
View File
@@ -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
src/main/java/io/v/nutz/meeting/controller/mobile/MMeetingMineController.java
+15 -1
View File
@@ -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);
src/main/resources/views/mobile/meeting/myMeeting.html
+1 -1
View File
@@ -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
src/main/resources/views/platform/hd/wmhd/mobile/staffActivities.html
+7 -1
View File
@@ -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("请您填写完整再提交！")
src/main/resources/views/platform/hd/wmhd/zpMange.html
+36 -24
View File
@@ -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",