diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.java b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.java
index 42fb263ecfa346e83af9c96818b984364d4667ab..2f624da7100d912baff6903b310865e18365b12e 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.java
+++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.java
@@ -27,6 +27,8 @@ public interface RoleMapper {
 
     int checkRoleIsExists(String uuid);
 
+    int checkRoleNameIsIsRepeat(RoleVo roleVo);
+
     List<RoleVo> searchRole(RoleVo roleVo);
 
     List<RoleVo> getRoleListByAuthName(String auth);
@@ -49,6 +51,8 @@ public interface RoleMapper {
 
     RoleVo getRoleByUuid(String uuid);
 
+    RoleVo getRoleByName(String name);
+
     RoleVo getRoleSimpleInfoByUuid(String uuid);
 
     List<RoleVo> getRoleByUuidList(List<String> uuidList);
@@ -109,11 +113,13 @@ public interface RoleMapper {
 
     int updateTeamRole(RoleTeamVo roleTeamVo);
 
+    int updateRoleIsDeletedByUuid(String uuid);
+
     int deleteRoleAuthByRoleUuid(String roleUuid);
 
     int deleteRoleAuth(RoleAuthVo roleAuthVo);
 
-    int deleteRoleByUuid(String uuid);
+//    int deleteRoleByUuid(String uuid);
 
     int deleteMenuRoleByRoleUuid(String roleUuid);
 
diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index 697c25ec685fee1d098a28f961d8f370e16df3f5..0c4f0af144d88fb953f21b62ed438ceead7f3868 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
@@ -28,9 +28,17 @@ limitations under the License.
     </select>
 
     <select id="checkRoleIsExists" parameterType="java.lang.String" resultType="int" useCache="false">
-        SELECT COUNT(`uuid`)
+        SELECT COUNT(1)
         FROM `role`
-        WHERE `uuid` = #{uuid}
+        WHERE `uuid` = #{uuid} and `is_delete` = 0
+    </select>
+
+    <select id="checkRoleNameIsIsRepeat" parameterType="neatlogic.framework.dto.RoleVo" resultType="int" useCache="false">
+        SELECT COUNT(1)
+        FROM `role`
+        WHERE `name` = #{name}
+          AND `uuid` != #{uuid}
+          AND `is_delete` = 0
     </select>
 
     <resultMap id="roleMap" type="neatlogic.framework.dto.RoleVo">
@@ -49,6 +57,7 @@ limitations under the License.
         FROM `role` a
         LEFT JOIN `role_authority` c ON a.`uuid` = c.`role_uuid`
         <where>
+            `is_delete` = 0
             <if test="keyword != null and keyword != ''">
                 AND (name LIKE CONCAT('%',#{keyword}, '%') OR description LIKE CONCAT('%',#{keyword}, '%'))
             </if>
@@ -78,8 +87,7 @@ limitations under the License.
         CONCAT("role#",a.`uuid`) AS `value`,
         a.`name` as `text`
         FROM `role` a
-        WHERE
-        1=1
+        WHERE `is_delete` = 0
         <if test="keyword != null and keyword != ''">
             AND (a.`name` LIKE CONCAT('%',#{keyword}, '%') OR a.`description` LIKE CONCAT('%',#{keyword}, '%'))
         </if>
@@ -102,8 +110,7 @@ limitations under the License.
         COUNT(DISTINCT (a.`uuid`))
         FROM `role` a
         LEFT JOIN `role_authority` b ON a.`uuid` = b.`role_uuid`
-        WHERE
-        1=1
+        WHERE `is_delete` = 0
         <if test="keyword != null and keyword != ''">
             AND (a.`name` LIKE CONCAT('%', #{keyword}, '%') OR a.`description` LIKE CONCAT('%', #{keyword}, '%'))
         </if>
@@ -132,11 +139,26 @@ limitations under the License.
         WHERE `uuid` = #{value}
     </select>
 
+    <select id="getRoleByName" parameterType="java.lang.String" resultType="neatlogic.framework.dto.RoleVo"
+            useCache="true">
+        SELECT `id`,
+               `uuid`,
+               `name`,
+               `description`,
+               `rule`,
+               `is_delete` AS isDelete
+        FROM `role`
+        WHERE `name` = #{value}
+    </select>
+
     <select id="getRoleSimpleInfoByUuid" parameterType="java.lang.String" resultType="neatlogic.framework.dto.RoleVo"
             useCache="true">
         SELECT `id`,
                `uuid`,
-               `name`
+               `name`,
+               `description`,
+               `rule`,
+               `is_delete` AS isDelete
         FROM `role`
         WHERE `uuid` = #{value}
     </select>
@@ -150,7 +172,7 @@ limitations under the License.
         `description`,
         `rule`
         FROM `role`
-        WHERE `uuid` in
+        WHERE `is_delete` = 0 AND `uuid` IN
         <foreach collection="list" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
@@ -165,7 +187,7 @@ limitations under the License.
         `description`,
         `rule`
         FROM `role`
-        WHERE `id` in
+        WHERE `is_delete` = 0 AND `id` in
         <foreach collection="list" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
@@ -177,7 +199,7 @@ limitations under the License.
         `uuid`,
         `rule`
         FROM `role`
-        WHERE `uuid` in
+        WHERE `is_delete` = 0 AND `uuid` in
         <foreach collection="list" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
@@ -193,13 +215,13 @@ limitations under the License.
     <select id="getRoleUuidByName" parameterType="java.lang.String" resultType="java.lang.String">
         select `uuid`
         from `role`
-        where `name` = #{value}
+        where `is_delete` = 0 AND `name` = #{value}
     </select>
 
     <select id="getRoleUuidByNameList" parameterType="java.util.List" resultType="java.lang.String">
         select `uuid`
         from `role`
-        where `name` in
+        where `is_delete` = 0 AND `name` in
         <foreach collection="nameList" item="text" separator="," open="(" close=")">
             #{text}
         </foreach>
@@ -210,7 +232,7 @@ limitations under the License.
         CONCAT('role#', `uuid`) as `value`,
         `name` as `text`
         FROM `role`
-        WHERE `name` in
+        WHERE `is_delete` = 0 AND `name` in
         <foreach collection="list" item="text" separator="," open="(" close=")">
             #{text}
         </foreach>
@@ -370,15 +392,15 @@ limitations under the License.
         DISTINCT
         `uuid`
         FROM `role`
-        WHERE `uuid` in
+        WHERE `is_delete` = 0 AND `uuid` in
         <foreach collection="list" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
     </select>
 
     <insert id="insertRole" parameterType="neatlogic.framework.dto.RoleVo">
-        INSERT INTO `role` (`id`, `uuid`, `name`, `description`, `rule`)
-        VALUES (#{id}, #{uuid}, #{name}, #{description}, #{rule})
+        INSERT INTO `role` (`id`, `uuid`, `name`, `description`, `rule`, `is_delete`)
+        VALUES (#{id}, #{uuid}, #{name}, #{description}, #{rule}, 0)
     </insert>
 
     <insert id="replaceRoleUser" parameterType="neatlogic.framework.dto.RoleUserVo">
@@ -411,7 +433,8 @@ limitations under the License.
         UPDATE `role`
         SET `name`        = #{name},
             `description` = #{description},
-            `rule`         = #{rule}
+            `rule`        = #{rule},
+            `is_delete`   = #{isDelete}
         WHERE `uuid` = #{uuid}
     </update>
 
@@ -422,11 +445,17 @@ limitations under the License.
           AND `team_uuid` = #{teamUuid}
     </update>
 
-    <delete id="deleteRoleByUuid" parameterType="java.lang.String">
+    <update id="updateRoleIsDeletedByUuid" parameterType="java.lang.String">
+        UPDATE `role`
+        SET `is_delete` = 1
+        WHERE `uuid` = #{value}
+    </update>
+
+    <!--<delete id="deleteRoleByUuid" parameterType="java.lang.String">
         DELETE
         FROM `role`
         WHERE `uuid` = #{value}
-    </delete>
+    </delete>-->
 
     <delete id="deleteRoleAuthByRoleUuid" parameterType="string">
         DELETE
diff --git a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.java b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.java
index 6de28a5126b7eba8a7c03eb658f8682abb9016f3..cc760fe77b41f1b52e8cfd2187b17da1601be515 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.java
+++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.java
@@ -15,6 +15,8 @@ public interface TeamMapper {
 
     int checkTeamIsExists(String uuid);
 
+    int checkTeamNameIsIsRepeat(TeamVo teamVo);
+
     List<String> getTeamUuidListByUuidList(List<String> uuidList);
 
     TeamVo getTeamByUuid(String uuid);
@@ -35,6 +37,8 @@ public interface TeamMapper {
 
     List<TeamVo> getTeamByUuidList(List<String> teamUuidList);
 
+    List<TeamVo> getTeamListContainsDeletedByUuidList(List<String> teamUuidList);
+
     List<TeamVo> getTeamByIdList(List<Long> idList);
 
     List<String> getTeamUuidListByUserUuid(String userUuid);
@@ -55,6 +59,8 @@ public interface TeamMapper {
 
     List<String> getTeamUuidByName(String name);
 
+    TeamVo getTeamByNameAndParentUuid(TeamVo teamVo);
+
     List<TeamVo> getRepeatTeamNameByNameList(List<String> list);
 
     List<String> getChildrenUuidListByLeftRightCode(@Param("lft") Integer lft, @Param("rht") Integer rht);
@@ -85,13 +91,15 @@ public interface TeamMapper {
 
     int updateUpwardNamePathByLftRht(@Param("lft") Integer lft, @Param("rht") Integer rht);
 
+    int updateTeamIsDeletedByUuidList(List<String> uuidList);
+
     int deleteTeamUserByTeamUuid(String teamUuid);
 
     int deleteTeamUserByTeamUuidList(List<String> teamUuidList);
 
     int deleteTeamUserByTeamUuidAndUserUuidList(@Param("teamUuid") String teamUuid, @Param("userUuidList") List<String> userUuidList);
 
-    int deleteTeamByUuidList(List<String> uuidList);
+//    int deleteTeamByUuidList(List<String> uuidList);
 
     int deleteTeamRoleByTeamUuidList(List<String> teamUuidList);
 
diff --git a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
index 9151b91f2b3b3893398caabb0c861b9cade0de6b..10e72a7b7d79b055105bc3afe58db0b9ac58af64 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
@@ -178,7 +178,8 @@ limitations under the License.
         SELECT
         a.`id`,
         a.`uuid`,
-        a.`name`
+        a.`name`,
+        a.`is_delete` AS isDelete
         FROM
         `team` a
         <where>
@@ -205,11 +206,20 @@ limitations under the License.
     </select>
 
     <select id="checkTeamIsExists" parameterType="string" resultType="int" useCache="false">
-        SELECT COUNT(`uuid`)
+        SELECT COUNT(1)
         FROM `team`
         WHERE `uuid` = #{uuid} and `is_delete` = 0
     </select>
 
+    <select id="checkTeamNameIsIsRepeat" parameterType="neatlogic.framework.dto.TeamVo" resultType="int" useCache="false">
+        SELECT COUNT(1)
+        FROM `team`
+        WHERE `name` = #{name}
+          AND `parent_uuid` = #{parentUuid}
+          AND `uuid` != #{uuid}
+          AND `is_delete` = 0
+    </select>
+
     <select id="getTeamUuidListByUuidList" parameterType="java.util.List" resultType="java.lang.String"
             useCache="false">
         SELECT
@@ -302,6 +312,26 @@ limitations under the License.
         and `is_delete` = 0
     </select>
 
+    <select id="getTeamListContainsDeletedByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.TeamVo"
+            useCache="false">
+        SELECT
+        `id`,
+        `uuid`,
+        `name`,
+        `parent_uuid` AS parentUuid,
+        `level`,
+        `lft`,
+        `rht`,
+        `is_delete` AS isDelete,
+        `upward_uuid_path` AS upwardUuidPath,
+        `upward_name_path` AS upwardNamePath
+        FROM `team`
+        WHERE `uuid` in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
     <select id="getTeamByIdList" parameterType="java.lang.Long" resultType="neatlogic.framework.dto.TeamVo"
             useCache="false">
         SELECT
@@ -437,6 +467,17 @@ limitations under the License.
         where `name` = #{value} and `is_delete` = 0
     </select>
 
+    <select id="getTeamByNameAndParentUuid" parameterType="neatlogic.framework.dto.TeamVo" resultType="neatlogic.framework.dto.TeamVo">
+        select
+            `id`,
+            `uuid`,
+            `name`,
+            `parent_uuid` AS `parentUuid`
+        from `team`
+        where `name` = #{name}
+        and `parent_uuid` = #{parentUuid}
+    </select>
+
     <select id="getRepeatTeamNameByNameList" parameterType="java.util.List"
             resultType="neatlogic.framework.dto.TeamVo">
         select
@@ -546,6 +587,17 @@ limitations under the License.
                 0,
                 #{source},
                 NOW())
+        ON DUPLICATE KEY UPDATE
+             `name` = #{name},
+             `parent_uuid` = #{parentUuid},
+             `lft` = #{lft},
+             `rht` = #{rht},
+             `level` = #{level},
+             `upward_uuid_path` = #{upwardUuidPath},
+             `upward_name_path` = #{upwardNamePath},
+             `is_delete` = 0,
+             `source` = #{source},
+             `lcd` = NOW()
     </insert>
 
     <insert id="insertTeamForLdap" parameterType="neatlogic.framework.dto.TeamVo">
@@ -649,6 +701,15 @@ limitations under the License.
           AND (`lcd` &lt; #{lcd} OR `lcd` IS NULL)
     </update>
 
+    <update id="updateTeamIsDeletedByUuidList" parameterType="java.lang.String">
+        UPDATE `team`
+        SET `is_delete` = 1
+        WHERE `uuid`  IN
+        <foreach collection="list" item="uuid" open="(" separator="," close=")">
+            #{uuid}
+        </foreach>
+    </update>
+
     <delete id="deleteTeamUserByTeamUuid" parameterType="java.lang.String">
         DELETE
         FROM `user_team`
@@ -671,12 +732,12 @@ limitations under the License.
         </foreach>
     </delete>
 
-    <delete id="deleteTeamByUuidList" parameterType="java.util.List">
+    <!--<delete id="deleteTeamByUuidList" parameterType="java.util.List">
         DELETE FROM `team` WHERE `uuid` IN
         <foreach collection="list" item="uuid" open="(" separator="," close=")">
             #{uuid}
         </foreach>
-    </delete>
+    </delete>-->
 
     <delete id="deleteTeamRoleByTeamUuidList" parameterType="java.util.List">
         DELETE FROM `team_role` WHERE `team_uuid` IN
diff --git a/src/main/java/neatlogic/framework/dto/RoleVo.java b/src/main/java/neatlogic/framework/dto/RoleVo.java
index 03f5f6e4a6efc0aaa1749f7259b976fc17bdf9ec..5a857217fad8fd5e214f6a7bfe258a44510ee7d3 100644
--- a/src/main/java/neatlogic/framework/dto/RoleVo.java
+++ b/src/main/java/neatlogic/framework/dto/RoleVo.java
@@ -34,16 +34,16 @@ public class RoleVo extends BasePageVo implements Serializable {
 
     public static final String USER_DEFAULT_ROLE = "R_SYSTEM_USER";
     private Long id;
-    @EntityField(name = "角色uuid",
+    @EntityField(name = "common.uuid",
             type = ApiParamType.STRING)
     private String uuid;
-    @EntityField(name = "角色名称",
+    @EntityField(name = "common.name",
             type = ApiParamType.STRING)
     private String name;
-    @EntityField(name = "角色描述",
+    @EntityField(name = "common.description",
             type = ApiParamType.STRING)
     private String description;
-    @EntityField(name = "生效规则",
+    @EntityField(name = "common.rule",
             type = ApiParamType.STRING)
     private String rule;
     private int userCount;
@@ -61,9 +61,12 @@ public class RoleVo extends BasePageVo implements Serializable {
     /**
      * 此字段专供前端使用，用于渲染头像时区分对象类型，取值范围[user,team,role]
      */
-    @EntityField(name = "前端初始化类型，取值范围[user,team,role]", type = ApiParamType.STRING)
+    @EntityField(name = "common.inittype", type = ApiParamType.STRING)
     private final String initType = GroupSearch.ROLE.getValue();
 
+    @EntityField(name = "common.isdeleted", type = ApiParamType.ENUM)
+    private Integer isDelete;
+
     public RoleVo() {
     }
 
@@ -185,4 +188,12 @@ public class RoleVo extends BasePageVo implements Serializable {
     public void setRule(String rule) {
         this.rule = rule;
     }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/dto/WorkAssignmentUnitVo.java b/src/main/java/neatlogic/framework/dto/WorkAssignmentUnitVo.java
index eaf724d5dd06f6cb3aa2e892fbe0174cc5fb5f53..58a7747070d31149590fb221fe1a5f1c373b4ede 100644
--- a/src/main/java/neatlogic/framework/dto/WorkAssignmentUnitVo.java
+++ b/src/main/java/neatlogic/framework/dto/WorkAssignmentUnitVo.java
@@ -25,18 +25,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
  **/
 public class WorkAssignmentUnitVo {
-    @EntityField(name = "类型", type = ApiParamType.STRING)
+    @EntityField(name = "common.type", type = ApiParamType.STRING)
     private String initType;
     @EntityField(name = "uuid", type = ApiParamType.STRING)
     private String uuid;
-    @EntityField(name = "名称", type = ApiParamType.STRING)
+    @EntityField(name = "common.name", type = ApiParamType.STRING)
     private String name;
-    @EntityField(name = "VIP级别(0,1,2,3,4,5)", type = ApiParamType.ENUM)
+    @EntityField(name = "term.framework.user.viplevel", type = ApiParamType.ENUM)
     private Integer vipLevel;
-    @EntityField(name = "头像", type = ApiParamType.STRING)
+    @EntityField(name = "common.avatar", type = ApiParamType.STRING)
     private String avatar;
-    @EntityField(name = "拼音", type = ApiParamType.STRING)
+    @EntityField(name = "term.framework.pinyin", type = ApiParamType.STRING)
     private String pinyin;
+    @EntityField(name = "common.isdeleted", type = ApiParamType.ENUM)
+    private Integer isDelete;
 
     public WorkAssignmentUnitVo(UserVo userVo){
         this.initType = GroupSearch.USER.getValue();
@@ -45,16 +47,19 @@ public class WorkAssignmentUnitVo {
         this.vipLevel = userVo.getVipLevel();
         this.avatar = userVo.getAvatar();
         this.pinyin = userVo.getPinyin();
+        this.isDelete = userVo.getIsDelete();
     }
     public WorkAssignmentUnitVo(TeamVo teamVo){
         this.initType = GroupSearch.TEAM.getValue();
         this.uuid = teamVo.getUuid();
         this.name = teamVo.getName();
+        this.isDelete = teamVo.getIsDelete();
     }
     public WorkAssignmentUnitVo(RoleVo roleVo){
         this.initType = GroupSearch.ROLE.getValue();
         this.uuid = roleVo.getUuid();
         this.name = roleVo.getName();
+        this.isDelete = roleVo.getIsDelete();
     }
     public String getInitType() {
         return initType;
@@ -103,4 +108,12 @@ public class WorkAssignmentUnitVo {
     public void setPinyin(String pinyin) {
         this.pinyin = pinyin;
     }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/exception/role/RoleNameRepeatException.java b/src/main/java/neatlogic/framework/exception/role/RoleNameRepeatException.java
new file mode 100644
index 0000000000000000000000000000000000000000..7aac8a36e21e327ee6b276b11b50327135cc3597
--- /dev/null
+++ b/src/main/java/neatlogic/framework/exception/role/RoleNameRepeatException.java
@@ -0,0 +1,10 @@
+package neatlogic.framework.exception.role;
+
+import neatlogic.framework.exception.core.ApiRuntimeException;
+
+public class RoleNameRepeatException extends ApiRuntimeException {
+
+    public RoleNameRepeatException(String name) {
+        super("nfer.rolenamerepeatexception.rolenamerepeatexception", name);
+    }
+}
diff --git a/src/main/java/neatlogic/framework/exception/team/TeamNameRepeatException.java b/src/main/java/neatlogic/framework/exception/team/TeamNameRepeatException.java
new file mode 100644
index 0000000000000000000000000000000000000000..72c6fde78b6b49212686ddfc5388a161a2eed6cd
--- /dev/null
+++ b/src/main/java/neatlogic/framework/exception/team/TeamNameRepeatException.java
@@ -0,0 +1,10 @@
+package neatlogic.framework.exception.team;
+
+import neatlogic.framework.exception.core.ApiRuntimeException;
+
+public class TeamNameRepeatException extends ApiRuntimeException {
+
+    public TeamNameRepeatException(String name) {
+        super("nfet.teamnamerepeatexception.teamnamerepeatexception", name);
+    }
+}
diff --git a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java
index d28251ae1af57b02549b3f61e6bd1c851ae5ab3d..55c920cff3f8832d247b3761004016556f5d2352 100644
--- a/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java
+++ b/src/main/java/neatlogic/framework/util/NotifyPolicyUtil.java
@@ -222,7 +222,7 @@ public class NotifyPolicyUtil {
                 notifyVo.setCallerMessageHandlerClass(newsHandlerClass);
                 notifyVo.setCallerNotifyPolicyVo(notifyPolicyVo);
                 boolean isSentSuccessfully = handler.execute(notifyVo);
-                audit(policyHandler.getName(), notifyPolicyVo.getName(), notifyTriggerType.getText(), handler.getName(), isSentSuccessfully, notifyVo.getTitle(), notifyAuditMessage, notifyVo);
+                audit($.t(policyHandler.getName()), notifyPolicyVo.getName(), notifyTriggerType.getText(), handler.getName(), isSentSuccessfully, notifyVo.getTitle(), notifyAuditMessage, notifyVo);
             }
         }
     }
diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2024-01-24/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/framework/changelog/2024-01-24/neatlogic_tenant.sql
new file mode 100644
index 0000000000000000000000000000000000000000..77838328a64e5106de0722fbecb9e0f1b4945c12
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/framework/changelog/2024-01-24/neatlogic_tenant.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `role`
+    ADD COLUMN `is_delete` TINYINT(1) DEFAULT 0  NOT NULL   COMMENT '是否已删除' AFTER `rule`;
diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2024-01-24/version.json b/src/main/resources/neatlogic/resources/framework/changelog/2024-01-24/version.json
new file mode 100644
index 0000000000000000000000000000000000000000..f73bf58ce7315e02aaa84ad7648b2f0789d82420
--- /dev/null
+++ b/src/main/resources/neatlogic/resources/framework/changelog/2024-01-24/version.json
@@ -0,0 +1,10 @@
+{
+  "content":[
+    {
+      "type":"新增功能",
+      "detail":[
+        {"msg":"1.角色增加逻辑删除"}
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql
index af378a8d916559e0009b0695332414e580256c1f..ad0ef57bdb99623ec39dddb3d8fbb3ff3626e1cf 100644
--- a/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql
+++ b/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql
@@ -890,11 +890,11 @@ CREATE TABLE IF NOT EXISTS `role` (
   `uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'uuid',
   `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色名称',
   `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '角色描述',
-  `env` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '生效环境',
+  `rule` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '生效规则',
+  `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已删除',
   PRIMARY KEY (`uuid`) USING BTREE,
-  KEY `id` (`id`) USING BTREE,
-  KEY `idx_env` (`env`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='角色表';
+  KEY `id` (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='角色表';
 
 -- ----------------------------
 -- Table structure for role_authority