Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		 where r.role_name=#{roleName}
+		 where r.role_name=#{roleName} AND r.del_flag = 0 and r.status = 0
 		<if test="tenantId != null and tenantId != '' and tenantId !=0">
 			AND r.tenant_id = #{tenantId}
 		</if>
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		 where r.role_key=#{roleKey}
+		 where r.role_key=#{roleKey} AND r.del_flag = 0 and r.status = 0
 		<if test="tenantId != null and tenantId != '' and tenantId !=0">
 			AND r.tenant_id = #{tenantId}
 		</if>