Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
lym
2024-04-25 14:46:59 +08:00
parent aa7144a090
commit cc00b46d9a
7 changed files with 136 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java
+18 -4
View File
@@ -91,11 +91,25 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
validateProcessGroupExists(id);
ProcessGroupDO processGroup = processGroupMapper.selectById(id);
ProcessListSaveReqVO processListSaveReqVO = BeanUtils.toBean(processGroup, ProcessListSaveReqVO.class);
String[] items = processGroup.getItems().split(",");
if (processGroup.getItems() == null) {
return processListSaveReqVO;
}
String[] items = processGroup.getItems().split("(?<!^),,(?!$)|,\\s*");
// 移除由于连续逗号产生的前后空字符串
List<String> itemsList = Arrays.stream(items)
.filter(item -> !item.isEmpty())
.collect(Collectors.toList());
System.err.println(itemsList.size());
List<ProcessRespVO> lists = new ArrayList<>();
for (int i = 0; i < items.length; i++) {
if (processMapper.selectById(Long.valueOf(items[i])) != null)
lists.add(BeanUtils.toBean(processMapper.selectById(items[i]), ProcessRespVO.class));
// 判断items是否为空
if (itemsList.size() == 0) {
return processListSaveReqVO;
}
for (int i = 0; i < itemsList.size(); i++) {
if (processMapper.selectById(Long.valueOf(itemsList.get(i))) != null)
lists.add(BeanUtils.toBean(processMapper.selectById(itemsList.get(i)), ProcessRespVO.class));
}
processListSaveReqVO.setLists(lists);
return processListSaveReqVO;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java
+6 -11
View File
@@ -83,8 +83,10 @@ public class ProcessServiceImpl implements ProcessService {
public void updateProcess(ProcessUserSaveReqVO updateReqVO) {
// 校验存在
validateProcessExists(updateReqVO.getId());
// 校验状态
validateProcessStatus(updateReqVO.getId());
if (updateReqVO.getIsEnabled()) {//为禁用
throw exception(PROCESS_STATUS_DISABLE);
}
ProcessDO updateProcess = BeanUtils.toBean(updateReqVO, ProcessDO.class);
processUserService.deleteProcessUserByProcess(updateReqVO.getId());
@@ -102,8 +104,8 @@ public class ProcessServiceImpl implements ProcessService {
processUserService.createProcessUser(processAndUserSaveReqVO);
}
} catch (NumberFormatException e) {
// 处理NumberFormatException异常，例如记录日志
System.err.println("用户ID " + user + " 无法解析为长整型。");
throw exception(ERR);
}
}
}
@@ -125,13 +127,6 @@ public class ProcessServiceImpl implements ProcessService {
}
}
private void validateProcessStatus(Long id) {
ProcessDO process = processMapper.selectById(id);
if (process != null && process.getIsEnabled() == Boolean.FALSE) {
throw exception(PROCESS_STATUS_DISABLE);
}
}
@Override
public ProcessUserRespVO getProcess(Long id) {
// 校验存在