更新

src/main/java/org/jeecg/modules/archives/controller/ProjectManageArchivesController.java

@@ -40,6 +40,9 @@ public class ProjectManageArchivesController {
 	private ProjectManageArchivesService projectManageArchivesService;
 
 	@ApiOperation(value = "项目档案分页查询接口", notes = "项目档案分页查询")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pkOrg", value = "组织", required = true, dataType = "String")
+	})
 	@GetMapping(value = "/list")
 	public Result<IPage<ProjectManageArchives>> queryPageList(ProjectManageArchives projectManageArchives,
 			  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

src/main/java/org/jeecg/modules/archives/service/impl/ProjectManageArchivesServiceImpl.java

@@ -31,12 +31,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * @Description: project_manage_archives
- * @author： jeecg-boot
- * @date：   2021-02-24
- * @version： V1.0
- */
+ /** 
+   * @Author jihaosen
+   * @date 2021/2/2
+   * @desc 项目档案 service 服务
+   */
+ 
 @Service
 @Transactional
 public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageArchivesMapper, ProjectManageArchives> implements ProjectManageArchivesService {
@@ -146,6 +146,7 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
             List<ProjectManageBusinessOther> posts = postMap.get(respDTO.getKey());
             if(CollectionUtils.isEmpty(posts)){
                 respDTO.setIsLeaf(true);
+                respDTO.setChildren(null);
             }
             resp.add(respDTO);
         }
@@ -165,6 +166,7 @@ public class ProjectManageArchivesServiceImpl extends ServiceImpl<ProjectManageA
                 List<ProjectManageBusinessOther> posts = postMap.get(respDTO.getKey());
                 if(CollectionUtils.isEmpty(posts)){
                     respDTO.setIsLeaf(true);
+                    respDTO.setChildren(null);
                 }
                 resp.add(respDTO);
             }

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesCostController.java

@@ -13,7 +13,6 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.dto.basedata.ArchivesCostListRespDTO;
 import org.jeecg.common.dto.basedata.ArchivesCostReqDTO;
 import org.jeecg.modules.basedata.entity.BaseArchivesCost;
-import org.jeecg.modules.basedata.entity.BaseArchivesMilestone;
 import org.jeecg.modules.basedata.service.IBaseArchivesCostService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesMilestoneController.java

@@ -99,7 +99,7 @@ public class BaseArchivesMilestoneController {
 
 	 @ApiOperation(value = "编辑里程碑档案接口", notes = "编辑里程碑档案")
 	 @ApiImplicitParams({
-			 @ApiImplicitParam(name="parentId", value="父节点",required=true, dataType="String", defaultValue = "0"),
+			 @ApiImplicitParam(name="id", value="id",required=true, dataType="String", defaultValue = "0"),
 			 @ApiImplicitParam(name="parentId", value="父节点",required=true, dataType="String", defaultValue = "0"),
 			 @ApiImplicitParam(name="code", value="编码",required=true, dataType="String"),
 			 @ApiImplicitParam(name="name", value="名称",required=true, dataType="String"),
@@ -183,6 +183,7 @@ public class BaseArchivesMilestoneController {
 			 List<BaseArchivesMilestone> posts = postMap.get(archivesMilestoneListRespDTO.getKey());
 			 if(CollectionUtils.isEmpty(posts)){
 				 archivesMilestoneListRespDTO.setIsLeaf(true);
+				 archivesMilestoneListRespDTO.setChildren(null);
 			 }
 			 resp.add(archivesMilestoneListRespDTO);
 		 }
@@ -202,6 +203,7 @@ public class BaseArchivesMilestoneController {
 				 List<BaseArchivesMilestone> posts = postMap.get(archivesMilestoneListRespDTO.getKey());
 				 if(CollectionUtils.isEmpty(posts)){
 					 archivesMilestoneListRespDTO.setIsLeaf(true);
+					 archivesMilestoneListRespDTO.setChildren(null);
 				 }
 				 resp.add(archivesMilestoneListRespDTO);
 			 }

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesPostController.java

@@ -87,6 +87,7 @@ public class BaseArchivesPostController {
             LambdaQueryWrapper<BaseArchivesPost> contractClassLambdaQueryWrapper = new LambdaQueryWrapper<>();
             contractClassLambdaQueryWrapper.eq(BaseArchivesPost::getCode,baseArchivesPost.getCode());
             contractClassLambdaQueryWrapper.eq(BaseArchivesPost::getDelFlag,"0");
+            contractClassLambdaQueryWrapper.eq(BaseArchivesPost::getPkOrg, baseArchivesPost.getPkOrg());
             List<BaseArchivesPost> contractClassList = baseArchivesPostService.list(contractClassLambdaQueryWrapper);
             if(contractClassList.size()>0){
                 throw new RuntimeException("编码不能重复");
@@ -185,6 +186,7 @@ public class BaseArchivesPostController {
             List<BaseArchivesPost> posts = postMap.get(archivesPostListRespDTO.getKey());
             if(CollectionUtils.isEmpty(posts)){
                 archivesPostListRespDTO.setIsLeaf(true);
+                archivesPostListRespDTO.setChildren(null);
             }
             resp.add(archivesPostListRespDTO);
         }
@@ -204,6 +206,7 @@ public class BaseArchivesPostController {
                 List<BaseArchivesPost> posts = postMap.get(archivesPostListRespDTO.getKey());
                 if(CollectionUtils.isEmpty(posts)){
                     archivesPostListRespDTO.setIsLeaf(true);
+                    archivesPostListRespDTO.setChildren(null);
                 }
                 resp.add(archivesPostListRespDTO);
             }

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesProjectApprovalController.java

@@ -208,6 +208,7 @@ public class BaseArchivesProjectApprovalController {
             List<BaseArchivesProjectApproval> posts = postMap.get(baseArchivesProjectApprovalRespDTO.getKey());
             if(CollectionUtils.isEmpty(posts)){
                 baseArchivesProjectApprovalRespDTO.setIsLeaf(true);
+                baseArchivesProjectApprovalRespDTO.setChildren(null);
             }
             resp.add(baseArchivesProjectApprovalRespDTO);
         }
@@ -227,6 +228,7 @@ public class BaseArchivesProjectApprovalController {
                 List<BaseArchivesProjectApproval> posts = postMap.get(baseArchivesProjectApprovalRespDTO.getKey());
                 if(CollectionUtils.isEmpty(posts)){
                     baseArchivesProjectApprovalRespDTO.setIsLeaf(true);
+                    baseArchivesProjectApprovalRespDTO.setChildren(null);
                 }
                 resp.add(baseArchivesProjectApprovalRespDTO);
             }