springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventTransferRecord.java
@@ -78,7 +78,7 @@ private Integer processType; /**创建时间*/ @ApiModelProperty(name = "createAt", value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createAt; /**选择调解专家ID*/ @ApiModelProperty(name = "specialistId", value = "选择调解专家ID") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -85,8 +85,6 @@ @Override public R pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO) { log.info("=================当前登陆的用户信息，用户类型"+loginUserInfoVO.getType()+"社区id"+loginUserInfoVO.getCommunityId()); log.info("=====================当前的userType1:="+comEvent.getUserType()); Boolean isExpertCheck=false; Long expertId=null; Boolean isStretAccount = isStreetAccount(loginUserInfoVO); @@ -135,8 +133,6 @@ } } IPage<ComEvent> list=null; log.info("=====================当前的userType2:="+comEvent.getUserType()); log.info("=====================是否专家账号查看"+isExpertCheck); //是否为专家查看自己发布的事件 if (isExpertCheck && comEvent.getUserType()!=1){ if (nonNull(comEventMapper.listEventIds(expertId))){ @@ -860,7 +856,7 @@ Boolean isStretAccount = isStreetAccount(loginUserInfoVO); if (loginUserInfoVO.getType().equals(13) || loginUserInfoVO.getType().equals(11)){ ComSanshuoExpert expert=new ComSanshuoExpert(); //专家账号权限(后台) //专家后台账号 if (nonNull(loginUserInfoVO.getPhone())){ expert = comSanShuoExpertService.getOne(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getPhone, loginUserInfoVO.getPhone())); }else{ @@ -892,16 +888,19 @@ comEvent.setUserType(5); comEvent.setCommunityIds(cids); } if (isExpertCheck && comEvent.getUserType()!=1){ if (isExpertCheck){ if (nonNull(comEventMapper.listEventIds(expertId))){ List<Long> eventIds = comEventMapper.listEventIds(expertId); //获取该专家的所有事件 comEvent.setEventIds(eventIds); } } if (nonNull(loginUserInfoVO.getStreetId())){ log.info("=============当前账号的街道="+loginUserInfoVO.getStreetId()); } if (nonNull(loginUserInfoVO.getAccount())){ if (loginUserInfoVO.getAccount().equals("admin") && loginUserInfoVO.getStreetId().equals(Constants.ADMIN_STREET_ID)){ comEvent.setUserType(null); if (loginUserInfoVO.getAccount().equals("admin")){ comEvent.setUserType(9); } } List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -162,17 +162,16 @@ from com_sanshuo_event_info <where> event_process_status not in (9) <if test="comEvent.eventIds != null"> AND id in <foreach collection="comEvent.eventIds" item="id" separator="," open="(" close=")"> #{id} </foreach> </if> <if test="comEvent.userType == 1"> AND request_user_id=#{comEvent.requestUserId} </if> <if test="comEvent.userType == 2"> AND specialist_id=#{comEvent.specialistId} <if test="comEvent.eventIds != null"> AND id in <foreach collection="comEvent.eventIds" item="id" separator="," open="(" close=")"> #{id} </foreach> </if> </if> <if test="comEvent.userType == 3"> AND center_id=#{comEvent.centerId} @@ -194,17 +193,17 @@ from com_sanshuo_event_info <where> event_process_status not in (9) <if test="comEvent.eventIds != null"> AND id in <foreach collection="comEvent.eventIds" item="id" separator="," open="(" close=")"> #{id} </foreach> </if> <if test="comEvent.userType == 1"> AND request_user_id=#{comEvent.requestUserId} </if> <if test="comEvent.userType == 2"> AND specialist_id=#{comEvent.specialistId} <if test="comEvent.eventIds != null"> AND id in <foreach collection="comEvent.eventIds" item="id" separator="," open="(" close=")"> #{id} </foreach> </if> </if> <if test="comEvent.userType == 3"> AND center_id=#{comEvent.centerId}
