diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java index a8849305..96713c88 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java @@ -51,5 +51,7 @@ public class MemberVo { private Long memberId; @ApiModelProperty("成员名") private String memberName; + @ApiModelProperty("userId") + private Long userId; } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 11a51052..d63f37a0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -606,6 +606,7 @@ public class CompeteTaskService implements ICompeteTaskService { MemberVo.MemberList memberList = memberListJsonResponse.getData(); if (ObjectUtil.isNotNull(memberList)) { memberId = memberList.getMemberId(); + userId = memberList.getUserId(); } //将该成员添加至角色下 diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java index 4e30b456..e3f7c08e 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java @@ -367,6 +367,8 @@ public class ProjectVo { private Long memberId; @ApiModelProperty("成员名") private String memberName; + @ApiModelProperty("userId") + private Long userId; } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index d3060c65..58ffdde5 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -457,6 +457,7 @@ public class ProMemberService implements IProMemberService { member = new ProjectVo.MemberList(); member.setMemberId(memberList.get(0).getId()); member.setMemberName(memberList.get(0).getNickname()); + member.setUserId(memberList.get(0).getUserId()); } return member; } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common