From 8dba8d30f6c0791f17d2ff057b06c5204f3a1f29 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 02 三月 2026 09:09:56 +0800
Subject: [PATCH] 客户反馈的bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPedigreeChartController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPedigreeChartController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPedigreeChartController.java
index 729c858..ffcfceb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPedigreeChartController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPedigreeChartController.java
@@ -62,7 +62,6 @@
private ISysUserService sysUserService;
-
/**
* 获取谱系图分页列表
*/
@@ -70,14 +69,14 @@
@ApiOperation(value = "谱系图-获取谱系图分页列表",response = TPedigreeChartQuery.class)
@PostMapping(value = "/api/t-pedigree-chart/pageList")
public R<PageInfo<TPedigreeChartVO>> pageList(@RequestBody String param) {
-
TPedigreeChartQuery query = JSON.parseObject(param, TPedigreeChartQuery.class);
SysUser sysUser = sysUserService.selectUserById(tokenService.getLoginUser().getUserId());
if (sysUser.getRoleType().equals("2")){
query.setRoleType(2);
List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
.list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
- if (!allProjectIds.isEmpty()){ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
+ if (!allProjectIds.isEmpty()){
+ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
.list().stream().map(TProjectTeam::getId).collect(Collectors.toList());
if (projectIds.isEmpty()){
return R.ok(new PageInfo<>());
@@ -88,19 +87,16 @@
}
}else if (!sysUser.getRoleType().equals("1")){
query.setRoleType(3);
-
List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
.list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
if (!allProjectIds.isEmpty()){ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
.eq(TProjectTeam::getStatus, 1).list().stream().map(TProjectTeam::getId).collect(Collectors.toList());
-
if (projectIds.isEmpty()){
return R.ok(new PageInfo<>());
}
query.setProjectIds(projectIds);
}else{
return R.ok(new PageInfo<>());
-
}
}else{
query.setRoleType(1);
@@ -547,6 +543,7 @@
}
@Log(title = "谱系图-谱系图-删除谱系图", businessType = BusinessType.DELETE)
@ApiOperation(value = "谱系图-删除谱系图")
+ @Transactional
@DeleteMapping(value = "/open/t-pedigree-chart/deleteProgenitor")
public R<Boolean> deleteProgenitor(@RequestParam String id) {
pedigreeChartService.removeById(id);
@@ -556,7 +553,12 @@
@ApiOperation(value = "谱系图-删除菌种传代项",response = TPedigreeChartParentDTO.class)
@DeleteMapping(value = "/open/t-pedigree-chart/deleteProgenitorChild")
public R<Boolean> deleteProgenitorChild(@RequestParam String id) {
- pedigreeChartDetailService.removeById(id);
+ List<TPedigreeChartDetail> children = pedigreeChartDetailService.lambdaQuery().eq(TPedigreeChartDetail::getParentId, id)
+ .list();
+ if (!children.isEmpty()){
+ return R.fail("请先删除子项");
+ }
+ pedigreeChartDetailService.removeById(id);
return R.ok();
}
@Log(title = "谱系图-谱系图-编辑菌种传代/传代数项", businessType = BusinessType.UPDATE)
--
Gitblit v1.7.1