QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:87383

Browse Source
This commit is contained in:
梁琦涛
2024-07-23 10:13:21 +08:00
parent 1a9854e519
commit d4a8a387e6
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+17
View File
@@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.SendMessageAPI;
import com.jero.common.api.dto.message.SendMessageDTO;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.activiti.common.ActivitiCommon;
import com.jero.modules.activiti.entity.ProcessAll;
@@ -74,6 +76,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
private ILawsMarketStandardService lawsMarketStandardService;
@Resource
private ProcessApprovalRecordService processApprovalRecordService;
@Resource
private SendMessageAPI sendMessageAPI;
@Override
@Transactional(rollbackFor = JeroBootException.class)
@@ -197,6 +201,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
update.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
update.eq(ProcessApprovalRecord::getNodeId,xmlNodeId);
update.set(ProcessApprovalRecord::getCommitText,"未处理");
update.set(ProcessApprovalRecord::getCommitFlag,"未处理");
update.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue());
update.set(ProcessApprovalRecord::getEndTime,new Date());
processApprovalRecordService.update(update);
@@ -283,6 +289,17 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
}
// 更新业务状态
lawsMarketStandardService.publish(processMarketStandardRelease.getManifestId());
String copyUser = processMarketStandardRelease.getCopyUser();
// 流程Key
String processDefinitionKey = ProcessType.MARKET_STANDARD_PUBLISH.getProcessKey();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(processDefinitionKey);
sendMessageDTO.setToUserId(copyUser);
Map<String, String> sendMap = new HashMap<>();
sendMap.put("manifestName", processMarketStandardRelease.getManifestName());
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);
}
@Override
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+2
View File
@@ -200,6 +200,8 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
update.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
update.eq(ProcessApprovalRecord::getNodeId,xmlNodeId);
update.set(ProcessApprovalRecord::getCommitText,"未处理");
update.set(ProcessApprovalRecord::getCommitFlag,"未处理");
update.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue());
update.set(ProcessApprovalRecord::getEndTime,new Date());
processApprovalRecordService.update(update);
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
-5
View File
@@ -416,11 +416,6 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
}
// 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
&& !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
return Result.error("没有权限");
}
if(Objects.equals(lawsMarketStandardOld.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
return Result.error("数据已发布");