|
@@ -430,6 +430,9 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
}
|
|
}
|
|
|
|
|
|
public String userSearch(String userId) {
|
|
public String userSearch(String userId) {
|
|
|
|
+ if(PublicUtil.isNull(userId)){
|
|
|
|
+ return "";
|
|
|
|
+ }
|
|
try {
|
|
try {
|
|
JSONArray array=tbApiService.userSearch(userId);
|
|
JSONArray array=tbApiService.userSearch(userId);
|
|
if(array!=null&&array.size()>0){
|
|
if(array!=null&&array.size()>0){
|
|
@@ -579,7 +582,17 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
public String getAllUserIds(String projectId){
|
|
public String getAllUserIds(String projectId){
|
|
String projectTagId=getProjectGroupId(projectId,true);// 父级项目分组ID
|
|
String projectTagId=getProjectGroupId(projectId,true);// 父级项目分组ID
|
|
if(PublicUtil.isNull(projectTagId)){
|
|
if(PublicUtil.isNull(projectTagId)){
|
|
- return null;
|
|
|
|
|
|
+ // 没有项目分组情况
|
|
|
|
+ List<String> list=new ArrayList<>();
|
|
|
|
+ JSONArray array3=tbApiService.getProjectMember(projectId);
|
|
|
|
+ if(array3!=null&&array3.size()>0){
|
|
|
|
+ for (int j = 0; j < array3.size(); j++) {
|
|
|
|
+ list.add(array3.getJSONObject(j).getString("userId"));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ Set<String> set=new HashSet(list);
|
|
|
|
+ String[] ids = set.toArray(new String[0]);
|
|
|
|
+ return String.join(",",ids);
|
|
}
|
|
}
|
|
String ids=getProjectGroupUserIds(projectTagId);
|
|
String ids=getProjectGroupUserIds(projectTagId);
|
|
// getProjectGroupId(projectTagId,false);// 父分组
|
|
// getProjectGroupId(projectTagId,false);// 父分组
|