diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsPersonalWeeklyReportSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsPersonalWeeklyReportSearchVo.java
index 340791d8f..70ea16e5a 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsPersonalWeeklyReportSearchVo.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsPersonalWeeklyReportSearchVo.java
@@ -9,7 +9,7 @@ import lombok.Data;
@ApiModel("个人周报工作项统计对象")
public class PmsPersonalWeeklyReportSearchVo {
- @ApiModelProperty(value = "用户gitlink用户id", hidden = true)
+ @ApiModelProperty(value = "用户gitlink用户id")
private Long userId;
@ApiModelProperty(value = "企业标识", hidden = true)
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsIssueCompletionMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsIssueCompletionMapper.java
index cd132ef5e..abe07bf5a 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsIssueCompletionMapper.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/mapper/PmsIssueCompletionMapper.java
@@ -12,4 +12,6 @@ public interface PmsIssueCompletionMapper {
int insert(PmsIssueCompletion completion);
int updateDescription(PmsIssueCompletion completion);
+
+ int deleteByGitlinkIssueIdAndUserId(@Param("gitlinkIssueId") String gitlinkIssueId, @Param("gitlinkUserId") String gitlinkUserId);
}
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/PmsProjectIssuesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/PmsProjectIssuesService.java
index 62c985364..a15009100 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/PmsProjectIssuesService.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/PmsProjectIssuesService.java
@@ -690,7 +690,7 @@ public class PmsProjectIssuesService {
}
public JSONObject getPersonalIssuesStatistics(String enterpriseIdentifier, PmsPersonalWeeklyReportSearchVo pmsPersonalWeeklyReportSearchVo) {
- Long gitlinkUserId = SecurityUtils.getGitlinkUserId();
+ Long gitlinkUserId = pmsPersonalWeeklyReportSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyReportSearchVo.getUserId();
pmsPersonalWeeklyReportSearchVo.setUserId(gitlinkUserId);
pmsPersonalWeeklyReportSearchVo.setEnterpriseIdentifier(enterpriseIdentifier);
JSONObject issueSearch = new JSONObject();
@@ -768,7 +768,7 @@ public class PmsProjectIssuesService {
public JSONObject getPersonalIssueList(PmsPersonalWeeklyIssuesSearchVo pmsPersonalWeeklyIssuesSearchVo) {
Long gitlinkUserId = pmsPersonalWeeklyIssuesSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyIssuesSearchVo.getUserId();
- pmsPersonalWeeklyIssuesSearchVo.setUserId(pmsPersonalWeeklyIssuesSearchVo.getUserId() == null ? SecurityUtils.getGitlinkUserId() : pmsPersonalWeeklyIssuesSearchVo.getUserId());
+ pmsPersonalWeeklyIssuesSearchVo.setUserId(gitlinkUserId);
JSONObject issueSearch = new JSONObject();
convertObjectToJSONObject(pmsPersonalWeeklyIssuesSearchVo, issueSearch, null);
try {
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsIssueCompletionServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsIssueCompletionServiceImpl.java
index e046931eb..377038703 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsIssueCompletionServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsIssueCompletionServiceImpl.java
@@ -1,5 +1,6 @@
package com.microservices.pms.project.service.impl;
+import com.microservices.common.core.utils.StringUtils;
import com.microservices.common.security.utils.SecurityUtils;
import com.microservices.pms.project.domain.PmsIssueCompletion;
import com.microservices.pms.project.domain.vo.PmsProjectIssuesCompletionInputVo;
@@ -25,6 +26,10 @@ public class PmsIssueCompletionServiceImpl implements IPmsIssueCompletionService
completion.setGitlinkIssueId(completionInputVo.getGitlinkIssueId());
completion.setDescription(completionInputVo.getDescription());
completion.setGitlinkUserId(String.valueOf(SecurityUtils.getGitlinkUserId()));
+ if (StringUtils.isBlank(completionInputVo.getDescription())) {
+ issueCompletionMapper.deleteByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
+ return true;
+ }
// 判断是否已存在该 gitlink_issue_id 记录
PmsIssueCompletion existing = issueCompletionMapper.selectByGitlinkIssueIdAndUserId(completion.getGitlinkIssueId(), completion.getGitlinkUserId());
if (existing == null) {
diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsIssueCompletionMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsIssueCompletionMapper.xml
index 7886c62bc..8faab00ba 100644
--- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsIssueCompletionMapper.xml
+++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsIssueCompletionMapper.xml
@@ -66,6 +66,10 @@
where gitlink_issue_id = #{gitlinkIssueId} and gitlink_user_id = #{gitlinkUserId}
+
+ delete from pms_issue_completion
+ where gitlink_issue_id = #{gitlinkIssueId} and gitlink_user_id = #{gitlinkUserId}
+