lixing 4 роки тому
батько
коміт
f6507b6c3f

+ 8 - 8
fm-person/src/main/java/com/persagy/fm/department/controller/DepartmentController.java

@@ -171,13 +171,13 @@ public class DepartmentController {
         return ResultHelper.success();
     }
 
-    //    @Autowired
-    //    CreateDbService createDbService;
-    //
-    //    @PostMapping("/createDb")
-    //    public CommonResult test() {
-    //        createDbService.createDb("test");
-    //        return ResultHelper.success();
-    //    }
+//        @Autowired
+//        CreateDbService createDbService;
+//
+//        @PostMapping("/createDb")
+//        public CommonResult test() {
+//            createDbService.createDb("test");
+//            return ResultHelper.success();
+//        }
 }
 

+ 8 - 0
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepTranslatorImpl.java

@@ -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);

+ 2 - 1
fm-person/src/main/java/com/persagy/fm/depproject/service/impl/DepProjectServiceImpl.java

@@ -65,7 +65,8 @@ public class DepProjectServiceImpl extends ServiceImpl<DepProjectMapper, DepProj
         QueryDepProjectDTO queryDepProjectDTO = new QueryDepProjectDTO();
         queryDepProjectDTO.setDepId(depId);
         List<DepProject> depProjectList = queryDepProjectList(queryDepProjectDTO);
-        removeByIds(depProjectList);
+        List<String> idList = depProjectList.stream().map(DepProject::getId).collect(Collectors.toList());
+        removeByIds(idList);
     }
 
     /**