feature: 实体基类增加了删除标志字段，增加时默认写入0-未删除

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 用户信息业务对象 sys_user
+ * 用户信息业务对象 t_sys_user
  *
  * @author Michelle.Chung
  */
@@ -57,7 +57,7 @@ public class RemoteUserBo implements Serializable {
     private String nickName;
 
     /**
-     * 用户类型（sys_user系统用户）
+     * 用户类型（t_sys_user系统用户）
      */
     private String userType;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java

@@ -67,4 +67,10 @@ public class BaseEntity implements Serializable {
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
+    /**
+     * 删除标志
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Integer deleteFlag;
+
 }

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java

@@ -31,7 +31,13 @@ public enum DataBaseType {
     /**
      * SQL Server
      */
-    SQL_SERVER("Microsoft SQL Server");
+    SQL_SERVER("Microsoft SQL Server"),
+
+
+    /**
+     * 人大金仓
+     */
+    KING_BASE("kingbase");
 
     /**
      * 数据库类型

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java

@@ -47,6 +47,9 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
                             ? baseEntity.getCreateDept() : loginUser.getDeptId());
                     }
                 }
+                if(ObjectUtil.isNull(baseEntity.getDeleteFlag())){
+                    baseEntity.setDeleteFlag(0);
+                }
             }
         } catch (Exception e) {
             throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -10,7 +10,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 import java.util.Date;
 
 /**
- * 用户对象 sys_user
+ * 用户对象 t_sys_user
  *
  * @author Lion Li
  */

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -34,7 +34,7 @@
                         m.create_time
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-        left join sys_role r on rm.role_id = r.role_id and r.status = '0'
+        left join t_sys_role r on rm.role_id = r.role_id and r.status = '0'
         where m.menu_type in ('M', 'C')
             and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
         order by m.parent_id, m.order_num
@@ -56,7 +56,7 @@
         select distinct m.perms
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-        left join sys_role r on r.role_id = rm.role_id and r.status = '0'
+        left join t_sys_role r on r.role_id = rm.role_id and r.status = '0'
         where r.role_id in (select role_id from sys_user_role where user_id = #{userId})
     </select>
 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -22,7 +22,7 @@
         select p.post_id, p.dept_id, p.post_name, p.post_code, p.post_category
         from sys_post p
                  left join sys_user_post up on up.post_id = p.post_id
-                 left join sys_user u on u.user_id = up.user_id
+                 left join t_sys_user u on u.user_id = up.user_id
         where u.user_id = #{userId}
     </select>
 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -20,7 +20,7 @@
             u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         </if>
-        from sys_user u
+        from t_sys_user u
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -33,7 +33,7 @@
             u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         </if>
-        from sys_user u
+        from t_sys_user u
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -41,7 +41,7 @@
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
                u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
                d.dept_name, d.leader, u1.user_name as leaderName
-        from sys_user u
+        from t_sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
                  left join sys_user u1 on u1.user_id = d.leader
             ${ew.getCustomSqlSegment}
@@ -49,7 +49,7 @@
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
+        from t_sys_user u
              left join sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
              left join sys_role r on r.role_id = sur.role_id
@@ -58,7 +58,7 @@
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys_user u
+        from t_sys_user u
              left join sys_dept d on u.dept_id = d.dept_id
              left join sys_user_role sur on u.user_id = sur.user_id
              left join sys_role r on r.role_id = sur.role_id
@@ -66,7 +66,7 @@
     </select>
 
     <select id="countUserById" resultType="Long">
-        select count(*) from sys_user where del_flag = '0' and user_id = #{userId}
+        select count(*) from t_sys_user where del_flag = '0' and user_id = #{userId}
     </select>
 
 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="org.dromara.system.mapper.SysUserRoleMapper">
 
     <select id="selectUserIdsByRoleId" resultType="Long">
-        select u.user_id from sys_user u
+        select u.user_id from t_sys_user u
         inner join sys_user_role sur
             on u.user_id = sur.user_id and sur.role_id = #{roleId}
     </select>

ruoyi-visual/ruoyi-nacos/pom.xml

@@ -236,6 +236,11 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>8.6.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
@@ -313,6 +318,10 @@
             <artifactId>spring-boot-admin-client</artifactId>
             <version>${spring-boot-admin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+        </dependency>
     </dependencies>
 
     <build>