From 018e79b65cd6adc111a4ca3332121eaf7bd714f5 Mon Sep 17 00:00:00 2001
From: TanJ <tanjie@axzo.cn>
Date: Sat, 27 Jan 2024 15:54:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(2046)=20=20=E5=88=9B=E5=BB=BA=E8=B6=85?=
 =?UTF-8?q?=E7=AE=A1=E8=AE=BE=E7=BD=AEproduct=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/enums/DictWorkSpaceTypeEnum.java    | 28 +++++++++++++++----
 .../server/service/impl/RoleUserService.java  |  2 ++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictWorkSpaceTypeEnum.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictWorkSpaceTypeEnum.java
index 135b9950..40f69c45 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictWorkSpaceTypeEnum.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/DictWorkSpaceTypeEnum.java
@@ -2,6 +2,7 @@ package cn.axzo.tyr.client.model.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
 
 import java.util.Arrays;
 
@@ -17,22 +18,22 @@ public enum DictWorkSpaceTypeEnum {
     /**
      * 企业工作台
      */
-    ENT("ent", "企业工作台"),
+    ENT("ent", "企业工作台", 7,1),
 
     /**
      * 项目部工作台
      */
-    PROJ("proj", "项目部工作台"),
+    PROJ("proj", "项目部工作台",1,2),
 
     /**
      * OMS工作台
      */
-    OMS("oms", "OMS工作台"),
+    OMS("oms", "OMS工作台",6,6),
 
     /**
      * 班组工作台
      */
-    TEAM("team","班组工作台")
+    TEAM("team","班组工作台",0,0)
     ;
 
     @EnumValue
@@ -41,6 +42,12 @@ public enum DictWorkSpaceTypeEnum {
 
     private final String description;
 
+    @Getter
+    private final Integer superAdminProductType;
+    @Getter
+    private final Integer workspaceType;
+
+
     public String getValue() {
         return value;
     }
@@ -49,9 +56,11 @@ public enum DictWorkSpaceTypeEnum {
         return description;
     }
 
-    DictWorkSpaceTypeEnum(String value, String description) {
+    DictWorkSpaceTypeEnum(String value, String description, Integer superAdminProductType, Integer workspaceType) {
         this.value = value;
         this.description = description;
+        this.superAdminProductType = superAdminProductType;
+        this.workspaceType = workspaceType;
     }
 
     /**
@@ -63,4 +72,13 @@ public enum DictWorkSpaceTypeEnum {
     public static DictWorkSpaceTypeEnum getByValue(String value) {
         return Arrays.stream(values()).filter(l -> l.getValue().equals(value)).findFirst().orElse(null);
     }
+    /**
+     * 通过workspaceType值获取枚举类型
+     *
+     * @param workspaceType 工作台类型
+     * @return
+     */
+    public static DictWorkSpaceTypeEnum getByValueWorkspaceType(Integer workspaceType) {
+        return Arrays.stream(values()).filter(l -> l.getWorkspaceType().equals(workspaceType)).findFirst().orElse(null);
+    }
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
index 2d2f4ca9..1d68df6f 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
@@ -8,6 +8,7 @@ import cn.axzo.pokonyan.util.KeysUtil;
 import cn.axzo.tyr.client.common.enums.RoleResourceTypeEnum;
 import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
 import cn.axzo.tyr.client.model.BaseWorkspaceModel;
+import cn.axzo.tyr.client.model.enums.DictWorkSpaceTypeEnum;
 import cn.axzo.tyr.client.model.enums.IdentityType;
 import cn.axzo.tyr.client.model.enums.WorkerLeaderRoleEnum;
 import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo;
@@ -192,6 +193,7 @@ public class RoleUserService implements SaasRoleUserService {
             saasRole.setOwnerOuId(param.getOuId());
             saasRole.setRoleType(RoleTypeEnum.SUPER_ADMIN.getValue());
             saasRole.setIsDelete(0L);
+            saasRole.setProductUnitType(DictWorkSpaceTypeEnum.getByValueWorkspaceType(param.getWorkspaceType()).getSuperAdminProductType());
 
             checkRoleName(RoleTypeEnum.SUPER_ADMIN.getDesc(), param.getWorkspaceId(), param.getOuId());
             saasRoleDao.save(saasRole);