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

fix:87840

Browse Source
This commit is contained in:
梁琦涛
2024-07-31 19:18:57 +08:00
parent 9f35804bdc
commit 1cf2ef281c
17 changed files with 58 additions and 21 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
+10
View File
@@ -30,6 +30,8 @@ import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService;
import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService;
import com.jero.modules.sys.utils.UserUtils;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
@@ -78,6 +80,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
private ProcessApprovalRecordService processApprovalRecordService;
@Resource
private SendMessageAPI sendMessageAPI;
@Resource
private ISysUserService sysUserService;
@Override
public void startProcess(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
@@ -270,6 +274,12 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(processDefinitionKey);
sendMessageDTO.setToUserId(copyUser);
LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
querySysUser.eq(SysUser::getUsername,processMarketStandardRelease.getCreateBy());
SysUser sysUser = sysUserService.getOne(querySysUser,false);
if(!Objects.isNull(sysUser)){
sendMessageDTO.setSendUser(sysUser.getId());
}
Map<String, String> sendMap = new HashMap<>();
sendMap.put("manifestName", processMarketStandardRelease.getManifestName());
sendMessageDTO.setMap(sendMap);
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+10
View File
@@ -25,6 +25,8 @@ import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.activiti.service.ProcessNodeLinkService;
import com.jero.modules.sys.utils.UserUtils;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RuntimeService;
@@ -78,6 +80,8 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
private TaskService taskService;
@Resource
private ProcessEngine processEngine;
@Resource
private ISysUserService sysUserService;
@Override
public void startProcess(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
@@ -284,6 +288,12 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(processDefinitionKey);
sendMessageDTO.setToUserId(copyUser);
LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
querySysUser.eq(SysUser::getUsername,processNewStandardImport.getCreateBy());
SysUser sysUser = sysUserService.getOne(querySysUser,false);
if(!Objects.isNull(sysUser)){
sendMessageDTO.setSendUser(sysUser.getId());
}
Map<String, String> sendMap = new HashMap<>();
sendMap.put("standardNumber", standardImport.getStandardNumber());
sendMap.put("standardName", standardImport.getStandardName());
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
+1 -1
View File
@@ -200,7 +200,7 @@ public class MarketStandardController {
@ApiOperation(value = "外部标准库-市场法规清单-发布", notes = "外部标准库-市场法规清单-发布")
@ApiOperationSupport(order = 7)
@PostMapping(value = "/publish")
// @RequiresPermissions("marketStandard:publish")
@RequiresPermissions("marketStandard:publish")
public Result<?> publish(@RequestBody Map<String, String> map) {
if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
return Result.error("请选择数据!");