字典

hx-base/src/main/java/com/fjhx/base/system/SysLoginController.java

@@ -61,6 +61,10 @@ public class SysLoginController {
         String tenantId = request.getHeader("tenantId");
 
         TenantInfo tenantInfo = tenantInfoService.getOne(q -> q.eq(TenantInfo::getTenantId, tenantId));
+        if (tenantInfo == null) {
+            return AjaxResult.error("租户id不存在");
+        }
+
         if (Objects.equals(tenantInfo.getStatus(), 0)) {
             return AjaxResult.error("租户已被禁用");
         }

hx-file/src/test/java/Main.java

@@ -4,12 +4,12 @@ public class Main {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:17330/winfaster_slave?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
                 .username("fjhx2012mysql")
                 .password("3PN-Mzn#vnP&q6d")
                 .port(9989)
-                .module("hx-area")
-                .parent("com.fjhx.flow")
+                .module("hx-tenant")
+                .parent("com.fjhx.tenant")
                 .superServiceClass("com.ruoyi.common.core.service.BaseService")
                 .build();
     }

hx-tenant/src/main/java/com/fjhx/tenant/service/dict/impl/DictCommonTypeServiceImpl.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.tenant.entity.dict.dto.DictCommonTypeDto;
 import com.fjhx.tenant.entity.dict.dto.DictCommonTypeSelectDto;
 import com.fjhx.tenant.entity.dict.po.DictCommonType;
+import com.fjhx.tenant.entity.dict.po.DictTenantType;
 import com.fjhx.tenant.entity.dict.vo.DictCommonTypeVo;
 import com.fjhx.tenant.mapper.dict.DictCommonTypeMapper;
 import com.fjhx.tenant.service.dict.DictCommonTypeService;
+import com.fjhx.tenant.service.dict.DictTenantTypeService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -25,6 +28,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DictCommonTypeServiceImpl extends ServiceImpl<DictCommonTypeMapper, DictCommonType> implements DictCommonTypeService {
 
+    @Autowired
+    private DictTenantTypeService dictTenantTypeService;
+
     @Override
     public Page<DictCommonTypeVo> getPage(DictCommonTypeSelectDto dto) {
         IWrapper<DictCommonType> wrapper = getWrapper();
@@ -44,6 +50,7 @@ public class DictCommonTypeServiceImpl extends ServiceImpl<DictCommonTypeMapper,
 
     @Override
     public void add(DictCommonTypeDto dictCommonTypeDto) {
+        dictTenantTypeService.nameDuplication(DictTenantType::getCode, dictCommonTypeDto.getCode(), "已有租户创建此字典编码");
         nameDuplication(DictCommonType::getCode, dictCommonTypeDto.getCode(), "字典编码已存在");
         this.save(dictCommonTypeDto);
     }

ruoyi-admin/src/main/resources/application.yml

@@ -46,6 +46,9 @@ user:
 
 # Spring配置
 spring:
+  main:
+    allow-circular-references: true
+
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
@@ -53,7 +56,7 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles: 
+  profiles:
     active: dev
   # 文件上传
   servlet: