From 51b7745ad3d9a6811b19474522168424e48989dc Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 26 Jul 2024 17:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=B4=A6=E5=8F=B7=E4=B9=9F?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=B0=83=E7=94=A8=E3=80=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=A8=A1=E5=9D=97=E5=92=8C=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseModuleController.java      |  4 ++--
 .../basicdata/mapper/xml/BaseModuleMapper.xml |  3 +++
 .../service/impl/BaseModuleServiceImpl.java   | 21 +++++++++++++------
 .../service/impl/SystemUserServiceImpl.java   |  2 ++
 4 files changed, 22 insertions(+), 8 deletions(-)

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 905978837..ecd9c8b3a 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
@@ -216,11 +216,11 @@ public class BaseModuleController {
         }
     }
 
-    @ApiOperation(value = "查询项目配置的模块和菜单列表", notes = "查询项目配置的模块和菜单列表", httpMethod = "POST")
+    @ApiOperation(value = "查询配置的模块和菜单列表", notes = "查询配置的模块和菜单列表", httpMethod = "POST")
     @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"),
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, 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/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
index 4769fae9a..854a32455 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
@@ -9,6 +9,9 @@
         <if test="projectSelectType == '1'.toString()">
             and a.module_type in (2,4)
         </if>
+        <if test="moduleType != null and moduleType != ''">
+            and a.module_type = #{moduleType}
+        </if>
         ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id
     </select>
     <select id="getProjectModuleList" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseModule">
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 d4427634a..edb3e76c3 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,12 +1,10 @@
 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;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
-import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu;
 import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
 import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
@@ -20,6 +18,7 @@ import com.zhgd.xmgl.modules.basicdata.service.IBaseAuthorityService;
 import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,7 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 模块
@@ -48,6 +46,9 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
     private SystemUserServiceImpl systemUserService;
     @Autowired
     private CompanyConfigMapper companyConfigMapper;
+    @Lazy
+    @Autowired
+    private CompanyConfigServiceImpl companyConfigService;
     @Autowired
     private IBaseAuthorityService baseAuthorityService;
 
@@ -105,10 +106,13 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
         if (systemUser == null) {
             throw new OpenAlertException("账号不存在");
         }
-        if (StrUtil.isBlank(projectSn)) {
-            throw new OpenAlertException("projectSn不能为空");
+        CompanyConfig companyConfig;
+        if (StrUtil.isNotBlank(projectSn)) {
+            companyConfig = companyConfigMapper.getCompanyConfigByProject(projectSn);
+        } else {
+            //企业类型
+            companyConfig = companyConfigMapper.getCompanyConfigBySn(systemUser.getSn());
         }
-        CompanyConfig companyConfig = companyConfigMapper.getCompanyConfigByProject(projectSn);
         if (companyConfig == null) {
             throw new OpenAlertException("企业配置不存在");
         }
@@ -116,6 +120,11 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
             return systemUserService.getUserAuthority(null, SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue(), projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);
         } else if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue()) || Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) {
             return systemUserService.getUserAuthority(Long.valueOf(userId), systemUser.getAccountType(), projectSn, companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);
+        } else if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_ADMINISTRATOR_ACCOUNT.getValue())
+                || Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_DISTRICT_ACCOUNT.getValue())
+                || Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_CITY_ACCOUNT.getValue())
+                || Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.ENTERPRISE_SUB_ACCOUNT.getValue())) {
+            return systemUserService.getUserAuthority(Long.valueOf(userId), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType(), moduleType);
         }
         return null;
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index 05957d582..16ae98256 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -1049,12 +1049,14 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         param.put("styleType", styleType);
         if (Objects.equals(accountType, SystemUserAccountTypeEnum.ENTERPRISE_ADMINISTRATOR_ACCOUNT.getValue())) {
             param.put("headquartersSn", headquartersSn);
+            param.put("moduleType", moduleType);
             moduleList = baseModuleMapper.getCompanyModuleList(param);
             menuList = baseMenuService.selectHeadquartersMenuList(param);
             actionList = baseActionMapper.getHeadquartersActionList(param);
             data.put("roleName", "公司管理员");
         } else if (Objects.equals(accountType, SystemUserAccountTypeEnum.ENTERPRISE_DISTRICT_ACCOUNT.getValue()) || Objects.equals(accountType, SystemUserAccountTypeEnum.ENTERPRISE_CITY_ACCOUNT.getValue()) || Objects.equals(accountType, SystemUserAccountTypeEnum.ENTERPRISE_SUB_ACCOUNT.getValue())) {
             param.put("userId", userId);
+            param.put("moduleType", moduleType);
             moduleList = baseModuleMapper.getUserModuleList(param);
             menuList = baseMenuService.selectComapnyUserMenuList(param);
             actionList = baseActionMapper.getComapnyUserActionList(param);