lixing 4 gadi atpakaļ
vecāks
revīzija
2f06e299fb

+ 0 - 27
fm-person/src/main/java/com/persagy/fm/common/utils/CreateDbUtil.java

@@ -1,27 +0,0 @@
-package com.persagy.fm.common.utils;
-
-import org.springframework.beans.factory.annotation.Value;
-
-/**
- * 创建数据库工具类
- *
- * @author lixing
- * @version V1.0 2021/3/29 5:39 下午
- **/
-public class CreateDbUtil {
-    @Value("${spring.application.name}")
-    private String applicationName;
-
-    /**
-     * 创建数据库
-     *
-     * @param groupCode
-     * @return void
-     * @exception
-     * @author lixing
-     * @version V1.0 2021/3/29 5:42 下午
-     */
-    public static void createDb(String groupCode) {
-
-    }
-}

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

@@ -17,6 +17,7 @@ import com.persagy.fm.department.utils.DepDataUtil;
 import com.persagy.fm.depproject.model.DepProject;
 import com.persagy.fm.depproject.model.dto.QueryDepProjectDTO;
 import com.persagy.fm.depproject.service.IDepProjectService;
+import com.persagy.fm.mybatis.service.CreateDbService;
 import com.persagy.fm.person.service.IPersonService;
 import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
 import com.persagy.fm.translate.model.Trans;
@@ -172,5 +173,14 @@ public class DepartmentController {
         departmentService.checkDeletable(deleteDepartmentDTO.getId());
         return ResultHelper.success();
     }
+
+//    @Autowired
+//    CreateDbService createDbService;
+//
+//    @PostMapping("/createDb")
+//    public CommonResult test() {
+//        createDbService.createDb("test");
+//        return ResultHelper.success();
+//    }
 }
 

+ 3 - 1
fm-person/src/main/java/com/persagy/fm/saas/project/service/impl/SaasProjectServiceImpl.java

@@ -66,7 +66,9 @@ public class SaasProjectServiceImpl implements ISaasProjectService {
             return null;
         }
         List<SaasAreaProjectTreeItemVO> areas = saasAreaProjectTreeVO.getAreas();
-
+        if (CollectionUtils.isEmpty(areas)) {
+            return null;
+        }
         List<ProjectTreeItemVO> result = Lists.newArrayList();
         for (SaasAreaProjectTreeItemVO area : areas) {
             ProjectTreeItemVO projectTreeItemVO = convert2ProjectTreeItemVO(area);