From cd6a2275b8b8478c9257321065d07dbd38bf1a39 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Tue, 13 May 2025 15:36:14 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat(=E7=9F=A5=E8=AF=86=E5=BA=93):?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=96=87=E4=BB=B6=E5=A4=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=96=87=E4=BB=B6=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E5=AD=90=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../microservices/pms/document/domain/vo/PmsDocumentVo.java | 3 +++ .../pms/document/mapper/PmsDocumentMapper.java | 2 ++ .../pms/document/service/impl/PmsDocumentServiceImpl.java | 3 +++ .../src/main/resources/mapper/pms/PmsDocumentMapper.xml | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java index baf36d83a..3117cec10 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/domain/vo/PmsDocumentVo.java @@ -72,4 +72,7 @@ public class PmsDocumentVo @ApiModelProperty(value = "是否被收藏") private Boolean isFavour; + + @ApiModelProperty(value = "是否存在子文件夹") + private Boolean hasChildDir=false; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java index 4c8842a60..489589de7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/mapper/PmsDocumentMapper.java @@ -86,4 +86,6 @@ public interface PmsDocumentMapper Long[] selectLinkedRepoIds(@Param("enterpriseId") Long enterpriseId, @Param("projectId") Long projectId); List selectPmsFavoriteDocumentList(PmsDocumentFavoriteSearchVo pmsDocumentFavoriteSearchVo); + + boolean hasChildDirById(@Param("documentId") Long documentId); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java index 24d28a868..190414e15 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/document/service/impl/PmsDocumentServiceImpl.java @@ -231,6 +231,9 @@ public class PmsDocumentServiceImpl implements IPmsDocumentService } pmsDocumentVo.setWikiRepositorySimpleInfo(wikiRepositoryInfo); pmsDocumentVo.setIsFavour(pmsDocumentUserFavoriteMapper.isDocumentInFavorites(SecurityUtils.getUserId(), pmsDocument.getId())); + if (PmsDocumentType.DOCUMENT_DIRECTORY.getKey() == pmsDocumentVo.getDocType()) { + pmsDocumentVo.setHasChildDir(pmsDocumentMapper.hasChildDirById(pmsDocument.getId())); + } return pmsDocumentVo; } diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml index 09af9d367..331712843 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsDocumentMapper.xml @@ -230,4 +230,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pms_project_id = #{projectId} and wiki_gitlink_repo_id is not null + \ No newline at end of file From 4a8f9b971f2c2ff8eb1bbee0cdd3f7a8621b1305 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 15 May 2025 15:42:49 +0800 Subject: [PATCH 02/11] fixed issue add statusMsg --- .../pms/project/domain/vo/PmsProjectIssuesInputVo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java index 4095d75c7..f4b6af74f 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java @@ -64,6 +64,9 @@ public class PmsProjectIssuesInputVo { @NotNull private Integer statusId; + @ApiModelProperty(value = "状态 1新增 2正在解决 3已解决 4反馈 5关闭 6拒绝") + private String statusMsg; + @ApiModelProperty(value = "工作项类型 1需求 2任务 3缺陷 4周报") private Integer pmIssueType; From 4cef9d6a449035639c536642f256943f1d3e069b Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Sat, 17 May 2025 08:17:31 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feat(=E5=88=9B=E5=AE=A2=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=B5=84=E6=BA=90=E8=8E=B7=E5=8F=96):?= =?UTF-8?q?=E5=B7=B2=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E4=BB=A5=E4=B8=87?= =?UTF-8?q?=E4=B8=BA=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java | 2 +- .../com/microservices/dss/makerspace/mapper/TasksMapper.java | 2 +- .../dss/makerspace/service/impl/TasksServiceImpl.java | 2 +- .../src/main/resources/mapper/dss/TasksMapper.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java index 1609cdd4a..2791eecb8 100644 --- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java +++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/domain/vo/MakerSpaceTotalDataVo.java @@ -12,7 +12,7 @@ public class MakerSpaceTotalDataVo { private int totalApplicants; - private int currentTotalAwardAmount; + private float currentTotalAwardAmount; private float paidAwardAmount; diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java index c4c276149..766c9b370 100644 --- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java +++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/mapper/TasksMapper.java @@ -17,7 +17,7 @@ public interface TasksMapper{ int getTotalApplicantCount(); - int getCurrentTotalAwardAmount(); + float getCurrentTotalAwardAmount(); List getTaskPublishedCountsByYear(); diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java index 5daf8103a..8612c355f 100644 --- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java +++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java @@ -40,7 +40,7 @@ public class TasksServiceImpl implements ITasksService { MakerSpaceTotalDataVo makerSpaceTotalDataVo = new MakerSpaceTotalDataVo(); makerSpaceTotalDataVo.setTotalTasks(tasksMapper.getTotalTaskCount()); makerSpaceTotalDataVo.setTotalApplicants(tasksMapper.getTotalApplicantCount()); - makerSpaceTotalDataVo.setCurrentTotalAwardAmount(tasksMapper.getCurrentTotalAwardAmount()/10000); + makerSpaceTotalDataVo.setCurrentTotalAwardAmount(tasksMapper.getCurrentTotalAwardAmount() /10000); makerSpaceTotalDataVo.setPaidAwardAmount(tasksMapper.getPaidAwardAmount()/10000); makerSpaceTotalDataVo.setTotalVisits(tasksMapper.getTotalVisits()); makerSpaceTotalDataVo.setTaskPublishedCountsByYear(tasksMapper.getTaskPublishedCountsByYear()); diff --git a/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml b/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml index ac93372ba..f896e5380 100644 --- a/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml +++ b/microservices-modules/microservices-modules-dss/src/main/resources/mapper/dss/TasksMapper.xml @@ -53,8 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from papers where is_delete = 0 and parent_id = 0 - + select COALESCE(SUM(bounty), 0) from tasks where is_delete = 0 and `status` between 3 and 8 From 405cc2da3ef41bc55608762e13250d6f2ccb6c2b Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Sat, 17 May 2025 08:38:26 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat(=E5=88=9B=E5=AE=A2=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=B5=84=E6=BA=90=E8=8E=B7=E5=8F=96):?= =?UTF-8?q?=E5=B7=B2=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E4=BB=A5=E4=B8=87?= =?UTF-8?q?=E4=B8=BA=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dss/makerspace/service/impl/TasksServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java index 8612c355f..1306751b9 100644 --- a/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java +++ b/microservices-modules/microservices-modules-dss/src/main/java/com/microservices/dss/makerspace/service/impl/TasksServiceImpl.java @@ -40,7 +40,7 @@ public class TasksServiceImpl implements ITasksService { MakerSpaceTotalDataVo makerSpaceTotalDataVo = new MakerSpaceTotalDataVo(); makerSpaceTotalDataVo.setTotalTasks(tasksMapper.getTotalTaskCount()); makerSpaceTotalDataVo.setTotalApplicants(tasksMapper.getTotalApplicantCount()); - makerSpaceTotalDataVo.setCurrentTotalAwardAmount(tasksMapper.getCurrentTotalAwardAmount() /10000); + makerSpaceTotalDataVo.setCurrentTotalAwardAmount(tasksMapper.getCurrentTotalAwardAmount() /10000L); makerSpaceTotalDataVo.setPaidAwardAmount(tasksMapper.getPaidAwardAmount()/10000); makerSpaceTotalDataVo.setTotalVisits(tasksMapper.getTotalVisits()); makerSpaceTotalDataVo.setTaskPublishedCountsByYear(tasksMapper.getTaskPublishedCountsByYear()); From a78c9c2b5dbf051434670b01d9108877b9f008f8 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 09:49:52 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fixed=20=E5=B7=A5=E4=BD=9C=E9=A1=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsEnterpriseController.java | 11 +++++++++++ .../pms/enterprise/service/IPmsEnterpriseService.java | 3 +++ .../service/impl/PmsEnterpriseServiceImpl.java | 6 ++++++ .../controller/PmsProjectIssuesController.java | 6 ++++-- .../project/domain/vo/PmsProjectIssuesInputVo.java | 3 +++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java index d93342ef1..d52e3faed 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java @@ -160,4 +160,15 @@ public class PmsEnterpriseController extends BaseController @ApiParam(name = "gitlinkOrgId", value = "gitlink组织Id") @PathVariable Long gitlinkOrgId) { return genericsSuccess(pmsEnterpriseService.getWorkbenchUrl(gitlinkOrgId)); } + + /** + * 通过组织标识获取工作台访问地址（未开通返回null） + */ + @GetMapping("/getEnterpriseIdentifierByProjectId") + @ApiOperation(value = "通过组织标识获取工作台访问地址（未开通返回null）") + public GenericsAjaxResult getEnterpriseIdentifierByProjectId( + @ApiParam(name = "projectId", value = "项目Id") @PathVariable Long projectId) { + return genericsSuccess(pmsEnterpriseService.getEnterpriseByProjectId(projectId).getEnterpriseIdentifier()); + } + } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/IPmsEnterpriseService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/IPmsEnterpriseService.java index ede8a47e5..9c581c89e 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/IPmsEnterpriseService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/IPmsEnterpriseService.java @@ -149,4 +149,7 @@ public interface IPmsEnterpriseService { void increaseOpenEnterpriseProcessCount(Long gitlinkOrgId); void decreaseOpenEnterpriseProcessCount(Long gitlinkOrgId); + + + PmsEnterprise getEnterpriseByProjectId(Long projectId); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java index d3a7326ac..8aea746c5 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java @@ -617,4 +617,10 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { private Boolean checkEnterpriseInitComplete(Long gitlinkOrgId) { return !redisService.hasKey(CacheConstants.getGitlinkOrgIdOpenEnterpriseKey(gitlinkOrgId)); } + + @Override + public PmsEnterprise getEnterpriseByProjectId(Long projectId) { + PmsProject pmsProject = pmsProjectService.selectAndCheckPmsProjectById(projectId); + return pmsEnterpriseMapper.selectPmsEnterpriseByDeptId(pmsProject.getPmsEnterpriseId()); + } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectIssuesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectIssuesController.java index c1e4aedf2..9ad0f4084 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectIssuesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectIssuesController.java @@ -55,7 +55,8 @@ public class PmsProjectIssuesController extends BaseController { @RequiresPermissions("pms:pmsProjectIssues:add") @PostMapping("/add") @ApiOperation(value = "新增项目工作项") - public AjaxResult add(@RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) { + public AjaxResult add(@PathVariable String enterpriseIdentifier, @RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) { + pmsProjectIssuesInputVo.setEnterpriseIdentifier(enterpriseIdentifier); JSONObject result = pmsProjectIssuesService.insertPmsProjectIssuesRestricted(pmsProjectIssuesInputVo); return success(result); } @@ -66,7 +67,8 @@ public class PmsProjectIssuesController extends BaseController { @RequiresPermissions("pms:pmsProjectIssues:edit") @PostMapping("/edit/{id}") @ApiOperation(value = "编辑项目工作项") - public AjaxResult edit(@PathVariable("id") Long id, @RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) { + public AjaxResult edit(@PathVariable("id") Long id, @PathVariable String enterpriseIdentifier, @RequestBody PmsProjectIssuesInputVo pmsProjectIssuesInputVo) { + pmsProjectIssuesInputVo.setEnterpriseIdentifier(enterpriseIdentifier); JSONObject result = pmsProjectIssuesService.updatePmsProjectIssues(id, pmsProjectIssuesInputVo); return success(result); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java index f4b6af74f..214efa45a 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectIssuesInputVo.java @@ -15,6 +15,9 @@ import java.util.List; @ApiModel("项目工作项输入对象") public class PmsProjectIssuesInputVo { + @ApiModelProperty(value = "组织标识") + private String enterpriseIdentifier; + @ApiModelProperty(value = "工作项父id") private Long rootId; From f96ae2ce8f256e289cfa9b0398e238b5ee0c873c Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 09:59:27 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fixed=20=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E6=9F=A5=E8=AF=A2=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/enterprise/controller/PmsEnterpriseController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java index d52e3faed..cbcd11954 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java @@ -162,9 +162,9 @@ public class PmsEnterpriseController extends BaseController } /** - * 通过组织标识获取工作台访问地址（未开通返回null） + * 根据项目ID查询所属组织标识 */ - @GetMapping("/getEnterpriseIdentifierByProjectId") + @GetMapping("/getEnterpriseIdentifierByProjectId/{projectId}") @ApiOperation(value = "通过组织标识获取工作台访问地址（未开通返回null）") public GenericsAjaxResult getEnterpriseIdentifierByProjectId( @ApiParam(name = "projectId", value = "项目Id") @PathVariable Long projectId) { From 5838b0db3f01991210a88033e7ef820a6c482e46 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 10:08:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fixed=20=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E6=9F=A5=E8=AF=A2=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/enterprise/controller/PmsEnterpriseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java index cbcd11954..dc4c3e3c0 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/controller/PmsEnterpriseController.java @@ -165,7 +165,7 @@ public class PmsEnterpriseController extends BaseController * 根据项目ID查询所属组织标识 */ @GetMapping("/getEnterpriseIdentifierByProjectId/{projectId}") - @ApiOperation(value = "通过组织标识获取工作台访问地址（未开通返回null）") + @ApiOperation(value = "根据项目ID查询所属组织标识") public GenericsAjaxResult getEnterpriseIdentifierByProjectId( @ApiParam(name = "projectId", value = "项目Id") @PathVariable Long projectId) { return genericsSuccess(pmsEnterpriseService.getEnterpriseByProjectId(projectId).getEnterpriseIdentifier()); From 31ca5d313e3e33723535b81b810bfbc0d4d06280 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 10:26:18 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fixed=20=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E6=9F=A5=E8=AF=A2=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86,=E5=8F=96=E6=B6=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java index 8aea746c5..8f3139045 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java @@ -620,7 +620,7 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { @Override public PmsEnterprise getEnterpriseByProjectId(Long projectId) { - PmsProject pmsProject = pmsProjectService.selectAndCheckPmsProjectById(projectId); + PmsProject pmsProject = pmsProjectService.selectPmsProjectByIdNoCheckRole(projectId); return pmsEnterpriseMapper.selectPmsEnterpriseByDeptId(pmsProject.getPmsEnterpriseId()); } } From 94554977950661338be4a5878501f07207a1cffd Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 10:32:04 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fixed=20=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E6=9F=A5=E8=AF=A2=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86,=E5=8F=96=E6=B6=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java index 8f3139045..92382bacd 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java @@ -621,6 +621,6 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { @Override public PmsEnterprise getEnterpriseByProjectId(Long projectId) { PmsProject pmsProject = pmsProjectService.selectPmsProjectByIdNoCheckRole(projectId); - return pmsEnterpriseMapper.selectPmsEnterpriseByDeptId(pmsProject.getPmsEnterpriseId()); + return pmsEnterpriseMapper.selectPmsEnterpriseById(pmsProject.getPmsEnterpriseId()); } } From 890d0d9f504f5f3860d8fcd2464403ab5f454f89 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 11:12:55 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fixed=20=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E6=9F=A5=E8=AF=A2=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86,=E5=8F=96=E6=B6=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8B=A6=E6=88=AA=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PmsEnterpriseServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java index 92382bacd..45dfad9ec 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject; import com.microservices.common.core.constant.CacheConstants; import com.microservices.common.core.constant.HttpStatus; import com.microservices.common.core.constant.SecurityConstants; +import com.microservices.common.core.context.SecurityContextHolder; import com.microservices.common.core.enums.SystemRole; import com.microservices.common.core.exception.ServiceException; import com.microservices.common.core.utils.DateUtils; @@ -28,6 +29,7 @@ import com.microservices.pms.product.domain.vo.PmsProductSearchVo; import com.microservices.pms.product.service.IPmsProductRequirementTagService; import com.microservices.pms.product.service.IPmsProductService; import com.microservices.pms.project.domain.PmsProject; +import com.microservices.pms.project.mapper.PmsProjectMapper; import com.microservices.pms.project.service.IPmsProjectService; import com.microservices.pms.utils.PmsConstants; import com.microservices.pms.utils.PmsGitLinkRequestUrl; @@ -87,6 +89,8 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { private RedisService redisService; @Value("${pms.pmsUrl}") private String pmsUrl; + @Autowired + private PmsProjectMapper pmsProjectMapper; /** * 查询项目管理企业 @@ -620,7 +624,11 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { @Override public PmsEnterprise getEnterpriseByProjectId(Long projectId) { - PmsProject pmsProject = pmsProjectService.selectPmsProjectByIdNoCheckRole(projectId); - return pmsEnterpriseMapper.selectPmsEnterpriseById(pmsProject.getPmsEnterpriseId()); + PmsProject pmsProject = pmsProjectMapper.selectPmsProjectById(projectId); + PmsEnterprise pmsEnterprise = pmsEnterpriseMapper.selectPmsEnterpriseById(pmsProject.getPmsEnterpriseId()); + // 手动注入上下文 + SecurityContextHolder.setDeptId(pmsEnterprise.getDeptId().toString()); + checkEnterpriseIsCurrentEnterprise(pmsEnterprise); + return pmsEnterprise; } } From 5dc02cdd33ae5bc26df6ced781f98a665732bd02 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 20 May 2025 11:18:15 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fixed=20=E6=A0=B9=E6=8D=AE=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID=E6=9F=A5=E8=AF=A2=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=87=E8=AF=86,=E5=8F=96=E6=B6=88=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/service/impl/PmsEnterpriseServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java index 45dfad9ec..881585353 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/enterprise/service/impl/PmsEnterpriseServiceImpl.java @@ -626,9 +626,9 @@ public class PmsEnterpriseServiceImpl implements IPmsEnterpriseService { public PmsEnterprise getEnterpriseByProjectId(Long projectId) { PmsProject pmsProject = pmsProjectMapper.selectPmsProjectById(projectId); PmsEnterprise pmsEnterprise = pmsEnterpriseMapper.selectPmsEnterpriseById(pmsProject.getPmsEnterpriseId()); - // 手动注入上下文 - SecurityContextHolder.setDeptId(pmsEnterprise.getDeptId().toString()); - checkEnterpriseIsCurrentEnterprise(pmsEnterprise); +// // 手动注入上下文 +// SecurityContextHolder.setDeptId(pmsEnterprise.getDeptId().toString()); +// checkEnterpriseIsCurrentEnterprise(pmsEnterprise); return pmsEnterprise; } }