Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/controller/WfMeetingApplyController.java

@@ -98,9 +98,6 @@ public class WfMeetingApplyController {
     @XjrLog(value = "移动端会议信息会议的详情")
     public RT<MeetingMobileInfoVo> mobileInfo(@RequestParam Long id){
         MeetingMobileInfoVo meetingMobileInfoVo = wfMeetingApplyService.mobileInfo(id);
-        if (meetingMobileInfoVo == null) {
-           return RT.error("找不到此数据！");
-        }
         return RT.ok(meetingMobileInfoVo);
     }
 
@@ -197,7 +194,7 @@ public class WfMeetingApplyController {
     @SaCheckPermission("wfmeetingapply:detail")
     @XjrLog(value = "会议签到二维码-生成二维码")
     public RT<String> qrcode(@RequestParam Long id) throws Exception {
-        String url = commonPropertiesConfig.getDomainApp() + "/pages/meeting/permissions?id=" + id + "&type=0";
+        String url = commonPropertiesConfig.getDomainApp() + "/pages/meeting/detail?id=" + id + "&type=0";
         int width = 400;
         int height = 400;
         int margin = 1;

src/main/java/com/xjrsoft/module/oa/service/impl/WfMeetingApplyServiceImpl.java

@@ -43,6 +43,7 @@ import com.xjrsoft.module.workflow.mapper.WorkflowFormRelationMapper;
 import com.xjrsoft.module.workflow.mapper.WorkflowRecordMapper;
 import com.xjrsoft.module.workflow.service.IWorkflowExtraService;
 import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.camunda.bpm.engine.history.HistoricProcessInstance;
@@ -110,6 +111,8 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
                 .selectAs(MeetingRoom::getCapacity, MeetingRoomListVo::getCapacity)
                 .selectAs(BaseOfficeBuild::getName, MeetingRoomListVo::getOfficeBuildIdCn)
                 .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, MeetingRoom::getOfficeBuildId)
+                .like(StringUtils.isNotEmpty(dto.getName()), MeetingRoom::getName, dto.getName())
+                .like(StringUtils.isNotEmpty(dto.getOfficeBuildIdCn()), BaseOfficeBuild::getName, dto.getOfficeBuildIdCn())
                 .eq(MeetingRoom::getStatus, 1)
         ;
         List<MeetingRoomListVo> result = meetingRoomMapper.selectJoinList(MeetingRoomListVo.class, meetingRoomMPJLambdaWrapper);
@@ -137,7 +140,7 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
             meetingRoomListVo = new MeetingRoomListVo();
             for (WfMeetingApply wfMeetingApply : value) {
                 // 会议时间是否重叠
-                if (!(startTime.isBefore(wfMeetingApply.getMeetingApplyS()) || endTime.isAfter(wfMeetingApply.getMeetingApplyE()))) {
+                if (startTime.isBefore(wfMeetingApply.getMeetingApplyE()) && wfMeetingApply.getMeetingApplyS().isBefore(endTime)) {
                     isReservation = true;
                 }
                 reservationDetail.append(wfMeetingApply.getMeetingApplyS()).append("-").append(wfMeetingApply.getMeetingApplyE()).append("\r\n");
@@ -308,8 +311,7 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
                 }
                 LocalTime startTime = startTimeMap.get(id);
                 LocalTime endTime = endTimeMap.get(id);
-                if((oneStartTime.isAfter(startTime) && oneStartTime.isBefore(endTime))
-                        || (oneEndTime.isAfter(startTime) && oneEndTime.isBefore(endTime))){
+                if (oneStartTime.isBefore(endTime) && oneEndTime.isAfter(startTime)) {
                     adjustType = 0;
                 }
             }
@@ -439,6 +441,8 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
 
     @Override
     public MeetingMobileInfoVo mobileInfo(Long id) {
+        Long loginId = StpUtil.getLoginIdAsLong();
+
         MPJLambdaWrapper<WfMeetingApply> wfMeetingApplyPageVoMPJLambdaWrapper = new MPJLambdaWrapper<>();
         wfMeetingApplyPageVoMPJLambdaWrapper
                 .disableSubLogicDel()
@@ -469,6 +473,18 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
         MeetingMobileInfoVo info = this.selectJoinOne(MeetingMobileInfoVo.class, wfMeetingApplyPageVoMPJLambdaWrapper);
 
         if (ObjectUtils.isNotEmpty(info)) {
+            // 判断当前用户是否是当前会议的参与人
+            LambdaQueryWrapper<MeetingConferee> isMeetingConferee = new LambdaQueryWrapper<>();
+            isMeetingConferee
+                    .eq(MeetingConferee::getWfMeetingApplyId, id)
+                    .eq(MeetingConferee::getUserId, loginId)
+                    ;
+            List<MeetingConferee> meetingConfereeList = meetingConfereeMapper.selectList(isMeetingConferee);
+            // 既不是发起人也不是参与人
+            if(CollectionUtils.isEmpty(meetingConfereeList) && !info.getSponsorId().equals(loginId)){
+                return null;
+            }
+
             List<File> fileList = fileMapper.selectList(Wrappers.<File>query().lambda().eq(File::getFolderId, info.getPreMeetingInfoFileId()));
             info.setFileInfos(fileList);
 

src/main/java/com/xjrsoft/module/oa/vo/TodayMeetingMobilePageVo.java

@@ -72,7 +72,7 @@ public class TodayMeetingMobilePageVo {
     private Integer checkInStatus;
 
     /**
-     * 签到状态（0:未签到，1：已签到）
+     * 冲突状态（0:冲突，1：不冲突）
      */
     @ApiModelProperty("冲突状态（0:冲突，1：不冲突）")
     private Integer conflictStatus;

src/main/java/com/xjrsoft/module/student/service/impl/LeagueMembersManageServiceImpl.java

@@ -141,7 +141,7 @@ public class LeagueMembersManageServiceImpl extends MPJBaseServiceImpl<LeagueMem
                 .filter(u -> StringUtils.isNotEmpty(u.getCredentialNumber()))
                 .collect(Collectors.toMap(User::getCredentialNumber, u -> u,  (o1, o2) -> o1));
 
-        // 团员信息身份证号映射
+        // 已经维护的团员信息身份证号映射
         MPJLambdaWrapper<LeagueMembersManage> leagueMembersManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
         leagueMembersManageMPJLambdaWrapper
                 .select(LeagueMembersManage::getId)
@@ -167,20 +167,20 @@ public class LeagueMembersManageServiceImpl extends MPJBaseServiceImpl<LeagueMem
             // 判断必填字段
             if (ImportExcelUtil.isRequiredFieldsFilled(dto,
                     sb,
-                    i + 3)) {
+                    i + 4)) {
                 return sb.toString();
             }
 
             // 判断身份证对应的用户是否存在
             User user = userByCredentialNumberMap.get(dto.getIdCard());
             if(ObjectUtils.isEmpty(user)){
-                sb.append("第").append(i + 3).append("行数据的用户不存在!");
+                sb.append("第").append(i + 4).append("行数据的用户不存在!");
                 return sb.toString();
             }
 
             // 判断团员编号值是否为整数
             if(StringUtils.isNotEmpty(dto.getLeagueMembersNum()) && !StringUtils.isNumeric(dto.getLeagueMembersNum())){
-                sb.append("第").append(i + 3).append("行数据的团员编号包含非数字字符!");
+                sb.append("第").append(i + 4).append("行数据的团员编号包含非数字字符!");
                 return sb.toString();
             }