机构类型

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleAddParam.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperParam;
+import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.RoleType;
 import com.zhongshu.card.client.utils.type.school.RoleDefaultType;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -22,4 +23,7 @@ public class RoleAddParam extends SuperParam {
 
     @Schema(description = "默认角色的类型")
     RoleDefaultType roleDefaultType;
+
+    @Schema(description = "状态")
+    private DataState state = DataState.Enable;
 }

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleModel.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.RoleType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -27,6 +28,18 @@ public class RoleModel extends SuperModel {
     @Schema(description = "角色权限列表")
     private Set<String> auth;
 
+    @Schema(description = "状态")
+    private DataState state = DataState.Enable;
+
+    private String stateStr;
+
+    public String getStateStr() {
+        if (state != null) {
+            return state.getRemark();
+        }
+        return "";
+    }
+
     public String getRoleTypeStr() {
         if (roleType != null) {
             return roleType.getRemark();

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/Role.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.domain.org;
 
+import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.RoleType;
 import com.zhongshu.card.client.utils.type.school.RoleDefaultType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
@@ -54,6 +55,9 @@ public class Role extends SuperMain {
     @DBRef(lazy = true)
     private UserAccount creator;
 
+    @Schema(description = "状态")
+    private DataState state = DataState.Enable;
+
     /**
      * 构建角色
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RoleServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
+import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.RoleType;
 import com.zhongshu.card.server.core.dao.org.RoleDao;
 import com.zhongshu.card.server.core.domain.org.Role;
@@ -56,6 +57,9 @@ public class RoleServiceImpl extends SuperService {
         if (param.getSort() == null) {
             param.setSort(1L);
         }
+        if (param.getState() == null) {
+            param.setState(DataState.Enable);
+        }
         Role nameRole = roleDao.findTopByNameAndOid(param.getName(), oid);
         Role codeRole = roleDao.findTopByCodeAndOid(param.getCode(), oid);
         if (StringUtils.isEmpty(param.getId())) {