|
@@ -9,9 +9,11 @@ import com.persagy.fm.person.service.IPersonService;
|
|
|
import com.persagy.fm.saas.project.client.SaasProjectClient;
|
|
|
import com.persagy.fm.saas.project.model.SaasProject;
|
|
|
import com.persagy.fm.saas.project.model.dto.QuerySaasProjectDTO;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.assertj.core.util.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -32,6 +34,9 @@ public class DepTranslatorImpl implements IDepTranslator {
|
|
|
@Override
|
|
|
public List<ManagerVO> getManagerVOList(String managers) {
|
|
|
String separator = ",";
|
|
|
+ if (StringUtils.isBlank(managers)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
String[] managersArr = managers.split(separator);
|
|
|
List<Long> managerIdList = Lists.newArrayList();
|
|
|
for (String managerIdStr : managersArr) {
|
|
@@ -48,6 +53,9 @@ public class DepTranslatorImpl implements IDepTranslator {
|
|
|
|
|
|
@Override
|
|
|
public List<ProjectVO> getProjectVOList(List<String> projectIds) {
|
|
|
+ if (CollectionUtils.isEmpty(projectIds)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
QuerySaasProjectDTO querySaasProjectDTO = new QuerySaasProjectDTO();
|
|
|
querySaasProjectDTO.setDefaultValue();
|
|
|
querySaasProjectDTO.setProjectIds(projectIds);
|