From 1ce681f2df248952236bacf69ff79ffe861e1865 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Sat, 13 Apr 2024 22:01:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/basicdata/controller/BaseModuleController.java | 1 +
 .../basicdata/service/impl/BaseModuleServiceImpl.java      | 5 +++++
 .../service/impl/FlowOrgRepositoryServiceImpl.java         | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java
index 044e78f9f..f1bddd2ef 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java
@@ -188,6 +188,7 @@ public class BaseModuleController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "moduleType", value = "模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板", paramType = "body", required = true, dataType = "String"),
     })
     @PostMapping(value = "/getModuleAndMenuList")
     public Result<Map<String, Object>> getModuleAndMenuList(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
index 693a40846..391734d45 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.basicdata.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@ import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
 import com.zhgd.xmgl.modules.basicdata.service.IBaseAuthorityService;
 import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
 import org.apache.commons.collections.MapUtils;
+import org.mortbay.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -125,6 +127,9 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
         if (systemUser == null) {
             throw new OpenAlertException("账号不存在");
         }
+        if (StrUtil.isBlank(projectSn)) {
+            throw new OpenAlertException("projectSn不能为空");
+        }
         CompanyConfig companyConfig = companyConfigMapper.getCompanyConfigByProject(projectSn);
         if (companyConfig == null) {
             throw new OpenAlertException("企业配置不存在");
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
index 453909769..f1a6f84f4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.basicdata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -74,6 +75,12 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
         userOrgIds.add(xzProjectOrgId.toString());
         List<String> formIds = modelPermsMapper.selectList(Wrappers.<WflowModelPerms>lambdaQuery().in(WflowModelPerms::getOrgId, userOrgIds)).stream().map(w -> w.getFormId()).collect(Collectors.toList());
         List<String> permIds = modelPermsMapper.selectList(null).stream().map(w -> w.getFormId()).collect(Collectors.toList());
+        if (CollUtil.isEmpty(formIds)) {
+            formIds.add("0");
+        }
+        if (CollUtil.isEmpty(permIds)) {
+            permIds.add("0");
+        }
         List<WflowModels> wflowModels = wflowModelsMapper.selectList(Wrappers.<WflowModels>lambdaQuery().in(WflowModels::getFormId, formIds).or().notIn(WflowModels::getFormId, permIds));
         for (int i = 0; i < wflowModels.size(); i++) {
             ModelGroupVo.Form form = JSON.parseObject(JSONObject.toJSONString(wflowModels.get(i)), ModelGroupVo.Form.class);