Browse Source

【CHG】统一删除状态 del_flag = '1'

ZhaoMn 4 years ago
parent
commit
0c61bc7550

+ 1 - 1
railway-common/src/main/java/com/railway/common/core/domain/entity/SysDept.java

@@ -85,7 +85,7 @@ public class SysDept extends BaseEntity {
   private String status;
   private String status;
 
 
   /**
   /**
-   * 删除标志(0代表存在 2代表删除)
+   * 删除标志(0代表存在 1代表删除)
    */
    */
   private String delFlag;
   private String delFlag;
 
 

+ 1 - 1
railway-common/src/main/java/com/railway/common/core/domain/entity/SysRole.java

@@ -73,7 +73,7 @@ public class SysRole extends BaseEntity {
   private String status;
   private String status;
 
 
   /**
   /**
-   * 删除标志(0代表存在 2代表删除)
+   * 删除标志(0代表存在 1代表删除)
    */
    */
   private String delFlag;
   private String delFlag;
 
 

+ 1 - 1
railway-common/src/main/java/com/railway/common/core/domain/entity/SysUser.java

@@ -113,7 +113,7 @@ public class SysUser extends BaseEntity {
   private String status;
   private String status;
 
 
   /**
   /**
-   * 删除标志(0代表存在 2代表删除)
+   * 删除标志(0代表存在 1代表删除)
    */
    */
   private String delFlag;
   private String delFlag;
 
 

+ 1 - 1
railway-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -154,7 +154,7 @@
   </update>
   </update>
 
 
   <delete id="deleteDeptById" parameterType="Long">
   <delete id="deleteDeptById" parameterType="Long">
-    update sys_dept set del_flag = '2' where dept_id = #{deptId}
+    update sys_dept set del_flag = '1' where dept_id = #{deptId}
   </delete>
   </delete>
 
 
 </mapper> 
 </mapper> 

+ 2 - 2
railway-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -140,11 +140,11 @@
   </update>
   </update>
 
 
   <delete id="deleteRoleById" parameterType="Long">
   <delete id="deleteRoleById" parameterType="Long">
-    update sys_role set del_flag = '2' where role_id = #{roleId}
+    update sys_role set del_flag = '1' where role_id = #{roleId}
   </delete>
   </delete>
 
 
   <delete id="deleteRoleByIds" parameterType="Long">
   <delete id="deleteRoleByIds" parameterType="Long">
-    update sys_role set del_flag = '2' where role_id in
+    update sys_role set del_flag = '1' where role_id in
     <foreach collection="array" item="roleId" open="(" separator="," close=")">
     <foreach collection="array" item="roleId" open="(" separator="," close=")">
       #{roleId}
       #{roleId}
     </foreach>
     </foreach>

+ 2 - 2
railway-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -215,11 +215,11 @@
   </update>
   </update>
 
 
   <delete id="deleteUserById" parameterType="Long">
   <delete id="deleteUserById" parameterType="Long">
-    update sys_user set del_flag = '2' where user_id = #{userId}
+    update sys_user set del_flag = '1' where user_id = #{userId}
   </delete>
   </delete>
 
 
   <delete id="deleteUserByIds" parameterType="Long">
   <delete id="deleteUserByIds" parameterType="Long">
-    update sys_user set del_flag = '2' where user_id in
+    update sys_user set del_flag = '1' where user_id in
     <foreach collection="array" item="userId" open="(" separator="," close=")">
     <foreach collection="array" item="userId" open="(" separator="," close=")">
       #{userId}
       #{userId}
     </foreach>
     </foreach>

+ 3 - 3
sql/railway.sql

@@ -12,7 +12,7 @@ create table sys_dept (
   phone             varchar(11)     default null               comment '联系电话',
   phone             varchar(11)     default null               comment '联系电话',
   email             varchar(50)     default null               comment '邮箱',
   email             varchar(50)     default null               comment '邮箱',
   status            char(1)         default '0'                comment '部门状态(0正常 1停用)',
   status            char(1)         default '0'                comment '部门状态(0正常 1停用)',
-  del_flag          char(1)         default '0'                comment '删除标志(0代表存在 2代表删除)',
+  del_flag          char(1)         default '0'                comment '删除标志(0代表存在 1代表删除)',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_time 	    datetime                                   comment '创建时间',
   create_time 	    datetime                                   comment '创建时间',
   update_by         varchar(64)     default ''                 comment '更新者',
   update_by         varchar(64)     default ''                 comment '更新者',
@@ -51,7 +51,7 @@ create table sys_user (
   avatar            varchar(100)    default ''                 comment '头像地址',
   avatar            varchar(100)    default ''                 comment '头像地址',
   password          varchar(100)    default ''                 comment '密码',
   password          varchar(100)    default ''                 comment '密码',
   status            char(1)         default '0'                comment '帐号状态(0正常 1停用)',
   status            char(1)         default '0'                comment '帐号状态(0正常 1停用)',
-  del_flag          char(1)         default '0'                comment '删除标志(0代表存在 2代表删除)',
+  del_flag          char(1)         default '0'                comment '删除标志(0代表存在 1代表删除)',
   login_ip          varchar(128)    default ''                 comment '最后登录IP',
   login_ip          varchar(128)    default ''                 comment '最后登录IP',
   login_date        datetime                                   comment '最后登录时间',
   login_date        datetime                                   comment '最后登录时间',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_by         varchar(64)     default ''                 comment '创建者',
@@ -109,7 +109,7 @@ create table sys_role (
   menu_check_strictly  tinyint(1)      default 1                  comment '菜单树选择项是否关联显示',
   menu_check_strictly  tinyint(1)      default 1                  comment '菜单树选择项是否关联显示',
   dept_check_strictly  tinyint(1)      default 1                  comment '部门树选择项是否关联显示',
   dept_check_strictly  tinyint(1)      default 1                  comment '部门树选择项是否关联显示',
   status               char(1)         not null                   comment '角色状态(0正常 1停用)',
   status               char(1)         not null                   comment '角色状态(0正常 1停用)',
-  del_flag             char(1)         default '0'                comment '删除标志(0代表存在 2代表删除)',
+  del_flag             char(1)         default '0'                comment '删除标志(0代表存在 1代表删除)',
   create_by            varchar(64)     default ''                 comment '创建者',
   create_by            varchar(64)     default ''                 comment '创建者',
   create_time          datetime                                   comment '创建时间',
   create_time          datetime                                   comment '创建时间',
   update_by            varchar(64)     default ''                 comment '更新者',
   update_by            varchar(64)     default ''                 comment '更新者',