LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 41534 收入合同-关联项目-选择会议-点击新增-点击选择会议页面---这块选择的会议没有数据,

Browse Source
This commit is contained in:
lijiarao
2021-10-28 18:20:47 +08:00
parent 6d4463b2a5
commit ca00bf1995
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+6 -3
View File
@@ -565,6 +565,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
IPage<PayMeeting> pageList; IPage<PayMeeting> pageList;
String permission = null; String permission = null;
Integer meetingType = payMeeting.getMeetingType(); Integer meetingType = payMeeting.getMeetingType();
if (meetingType != null) {
if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){
permission = "workGroupMeeting:search"; permission = "workGroupMeeting:search";
}else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)){ }else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)){
@@ -576,7 +577,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){ }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){
permission = "committeeMeeting:search"; permission = "committeeMeeting:search";
} }
}
if (StringUtils.isNotBlank(permission)) {
if (!Objects.equals(permission,"standardMeeting:search") && !rolePermissionService.getRolePermission(permission)) { if (!Objects.equals(permission,"standardMeeting:search") && !rolePermissionService.getRolePermission(permission)) {
if (!meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) { if (!meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) {
queryWrapper.eq("director_id", sysUser.getId()); queryWrapper.eq("director_id", sysUser.getId());
@@ -592,8 +594,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}else { }else {
pageList = page(page, queryWrapper); pageList = page(page, queryWrapper);
} }
}else {
pageList = page(page, queryWrapper);
}
for (PayMeeting meeting : pageList.getRecords()) { for (PayMeeting meeting : pageList.getRecords()) {
//查询会议负责人 //查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());