给用户和租户表增加delete_flag字段
This commit is contained in:
parent
bf3a7dc03b
commit
411effc0a7
@ -10,7 +10,7 @@ Target Server Type : MYSQL
|
|||||||
Target Server Version : 50704
|
Target Server Version : 50704
|
||||||
File Encoding : 65001
|
File Encoding : 65001
|
||||||
|
|
||||||
Date: 2024-09-27 00:47:46
|
Date: 2024-12-08 23:08:03
|
||||||
*/
|
*/
|
||||||
|
|
||||||
SET FOREIGN_KEY_CHECKS=0;
|
SET FOREIGN_KEY_CHECKS=0;
|
||||||
@ -851,13 +851,14 @@ CREATE TABLE `jsh_tenant` (
|
|||||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||||
`expire_time` datetime DEFAULT NULL COMMENT '到期时间',
|
`expire_time` datetime DEFAULT NULL COMMENT '到期时间',
|
||||||
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
|
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
|
||||||
|
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记,0未删除,1删除',
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='租户';
|
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='租户';
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of jsh_tenant
|
-- Records of jsh_tenant
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `jsh_tenant` VALUES ('13', '63', 'jsh', '2000', '1', '', '2021-02-17 23:19:17', '2099-02-17 23:19:17', null);
|
INSERT INTO `jsh_tenant` VALUES ('13', '63', 'jsh', '2000', '1', '', '2021-02-17 23:19:17', '2099-02-17 23:19:17', null, '0');
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for jsh_unit
|
-- Table structure for jsh_unit
|
||||||
@ -903,20 +904,21 @@ CREATE TABLE `jsh_user` (
|
|||||||
`phonenum` varchar(100) DEFAULT NULL COMMENT '手机号码',
|
`phonenum` varchar(100) DEFAULT NULL COMMENT '手机号码',
|
||||||
`ismanager` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否为管理者 0==管理者 1==员工',
|
`ismanager` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否为管理者 0==管理者 1==员工',
|
||||||
`isystem` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否系统自带数据 ',
|
`isystem` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否系统自带数据 ',
|
||||||
`Status` tinyint(4) DEFAULT '0' COMMENT '状态,0:正常,1:删除,2封禁',
|
`status` tinyint(4) DEFAULT '0' COMMENT '状态,0正常,2封禁',
|
||||||
`description` varchar(500) DEFAULT NULL COMMENT '用户描述信息',
|
`description` varchar(500) DEFAULT NULL COMMENT '用户描述信息',
|
||||||
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
|
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
|
||||||
`weixin_open_id` varchar(100) DEFAULT NULL COMMENT '微信绑定',
|
`weixin_open_id` varchar(100) DEFAULT NULL COMMENT '微信绑定',
|
||||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
||||||
|
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记,0未删除,1删除',
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=146 DEFAULT CHARSET=utf8 COMMENT='用户表';
|
) ENGINE=InnoDB AUTO_INCREMENT=146 DEFAULT CHARSET=utf8 COMMENT='用户表';
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of jsh_user
|
-- Records of jsh_user
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `jsh_user` VALUES ('63', '测试用户', 'jsh', 'e10adc3949ba59abbe56e057f20f883e', '0', '主管', null, '666666@qq.com', '1123123123132', '1', '1', '0', '', null, null, '63');
|
INSERT INTO `jsh_user` VALUES ('63', '测试用户', 'jsh', 'e10adc3949ba59abbe56e057f20f883e', '0', '主管', null, '666666@qq.com', '1123123123132', '1', '1', '0', '', null, null, '63', '0');
|
||||||
INSERT INTO `jsh_user` VALUES ('120', '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', '0', null, null, null, null, '1', '0', '0', null, null, null, '0');
|
INSERT INTO `jsh_user` VALUES ('120', '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', '0', null, null, null, null, '1', '0', '0', null, null, null, '0', '0');
|
||||||
INSERT INTO `jsh_user` VALUES ('131', 'test123', 'test123', 'e10adc3949ba59abbe56e057f20f883e', '0', '总监', null, '7777777@qq.com', '', '1', '0', '0', '', null, null, '63');
|
INSERT INTO `jsh_user` VALUES ('131', 'test123', 'test123', 'e10adc3949ba59abbe56e057f20f883e', '0', '总监', null, '7777777@qq.com', '', '1', '0', '0', '', null, null, '63', '0');
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for jsh_user_business
|
-- Table structure for jsh_user_business
|
||||||
|
|||||||
@ -1610,4 +1610,15 @@ alter table jsh_system_config add audit_print_flag varchar(1) DEFAULT '0' COMMEN
|
|||||||
-- 给商品表增加品牌、助记码字段
|
-- 给商品表增加品牌、助记码字段
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
alter table jsh_material add brand varchar(100) DEFAULT NULL COMMENT '品牌' after standard;
|
alter table jsh_material add brand varchar(100) DEFAULT NULL COMMENT '品牌' after standard;
|
||||||
alter table jsh_material add mnemonic varchar(100) DEFAULT NULL COMMENT '助记码' after brand;
|
alter table jsh_material add mnemonic varchar(100) DEFAULT NULL COMMENT '助记码' after brand;
|
||||||
|
|
||||||
|
-- --------------------------------------------------------
|
||||||
|
-- 时间 2024年12月08日
|
||||||
|
-- by jishenghua
|
||||||
|
-- 给用户表增加删除字段、修改状态表的备注
|
||||||
|
-- 给租户表增加删除字段
|
||||||
|
-- --------------------------------------------------------
|
||||||
|
alter table jsh_user add delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记,0未删除,1删除' after tenant_id;
|
||||||
|
alter table jsh_user change Status status tinyint(4) DEFAULT '0' COMMENT '状态,0正常,2封禁';
|
||||||
|
update jsh_user set delete_flag='1' where status=1;
|
||||||
|
alter table jsh_tenant add delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记,0未删除,1删除' after remark;
|
||||||
Binary file not shown.
@ -21,6 +21,8 @@ public class Tenant {
|
|||||||
|
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
private String deleteFlag;
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
@ -92,4 +94,12 @@ public class Tenant {
|
|||||||
public void setRemark(String remark) {
|
public void setRemark(String remark) {
|
||||||
this.remark = remark == null ? null : remark.trim();
|
this.remark = remark == null ? null : remark.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getDeleteFlag() {
|
||||||
|
return deleteFlag;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDeleteFlag(String deleteFlag) {
|
||||||
|
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -674,6 +674,76 @@ public class TenantExample {
|
|||||||
addCriterion("remark not between", value1, value2, "remark");
|
addCriterion("remark not between", value1, value2, "remark");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagIsNull() {
|
||||||
|
addCriterion("delete_flag is null");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagIsNotNull() {
|
||||||
|
addCriterion("delete_flag is not null");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag =", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag <>", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagGreaterThan(String value) {
|
||||||
|
addCriterion("delete_flag >", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag >=", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagLessThan(String value) {
|
||||||
|
addCriterion("delete_flag <", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag <=", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagLike(String value) {
|
||||||
|
addCriterion("delete_flag like", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotLike(String value) {
|
||||||
|
addCriterion("delete_flag not like", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagIn(List<String> values) {
|
||||||
|
addCriterion("delete_flag in", values, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotIn(List<String> values) {
|
||||||
|
addCriterion("delete_flag not in", values, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagBetween(String value1, String value2) {
|
||||||
|
addCriterion("delete_flag between", value1, value2, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
|
||||||
|
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Criteria extends GeneratedCriteria {
|
public static class Criteria extends GeneratedCriteria {
|
||||||
|
|||||||
@ -33,6 +33,8 @@ public class User {
|
|||||||
|
|
||||||
private Long tenantId;
|
private Long tenantId;
|
||||||
|
|
||||||
|
private String deleteFlag;
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
@ -160,4 +162,12 @@ public class User {
|
|||||||
public void setTenantId(Long tenantId) {
|
public void setTenantId(Long tenantId) {
|
||||||
this.tenantId = tenantId;
|
this.tenantId = tenantId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getDeleteFlag() {
|
||||||
|
return deleteFlag;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDeleteFlag(String deleteFlag) {
|
||||||
|
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -845,62 +845,62 @@ public class UserExample {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusIsNull() {
|
public Criteria andStatusIsNull() {
|
||||||
addCriterion("Status is null");
|
addCriterion("status is null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusIsNotNull() {
|
public Criteria andStatusIsNotNull() {
|
||||||
addCriterion("Status is not null");
|
addCriterion("status is not null");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusEqualTo(Byte value) {
|
public Criteria andStatusEqualTo(Byte value) {
|
||||||
addCriterion("Status =", value, "status");
|
addCriterion("status =", value, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusNotEqualTo(Byte value) {
|
public Criteria andStatusNotEqualTo(Byte value) {
|
||||||
addCriterion("Status <>", value, "status");
|
addCriterion("status <>", value, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusGreaterThan(Byte value) {
|
public Criteria andStatusGreaterThan(Byte value) {
|
||||||
addCriterion("Status >", value, "status");
|
addCriterion("status >", value, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
|
public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
|
||||||
addCriterion("Status >=", value, "status");
|
addCriterion("status >=", value, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusLessThan(Byte value) {
|
public Criteria andStatusLessThan(Byte value) {
|
||||||
addCriterion("Status <", value, "status");
|
addCriterion("status <", value, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusLessThanOrEqualTo(Byte value) {
|
public Criteria andStatusLessThanOrEqualTo(Byte value) {
|
||||||
addCriterion("Status <=", value, "status");
|
addCriterion("status <=", value, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusIn(List<Byte> values) {
|
public Criteria andStatusIn(List<Byte> values) {
|
||||||
addCriterion("Status in", values, "status");
|
addCriterion("status in", values, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusNotIn(List<Byte> values) {
|
public Criteria andStatusNotIn(List<Byte> values) {
|
||||||
addCriterion("Status not in", values, "status");
|
addCriterion("status not in", values, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusBetween(Byte value1, Byte value2) {
|
public Criteria andStatusBetween(Byte value1, Byte value2) {
|
||||||
addCriterion("Status between", value1, value2, "status");
|
addCriterion("status between", value1, value2, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Criteria andStatusNotBetween(Byte value1, Byte value2) {
|
public Criteria andStatusNotBetween(Byte value1, Byte value2) {
|
||||||
addCriterion("Status not between", value1, value2, "status");
|
addCriterion("status not between", value1, value2, "status");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1173,6 +1173,76 @@ public class UserExample {
|
|||||||
addCriterion("tenant_id not between", value1, value2, "tenantId");
|
addCriterion("tenant_id not between", value1, value2, "tenantId");
|
||||||
return (Criteria) this;
|
return (Criteria) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagIsNull() {
|
||||||
|
addCriterion("delete_flag is null");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagIsNotNull() {
|
||||||
|
addCriterion("delete_flag is not null");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag =", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag <>", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagGreaterThan(String value) {
|
||||||
|
addCriterion("delete_flag >", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag >=", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagLessThan(String value) {
|
||||||
|
addCriterion("delete_flag <", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
|
||||||
|
addCriterion("delete_flag <=", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagLike(String value) {
|
||||||
|
addCriterion("delete_flag like", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotLike(String value) {
|
||||||
|
addCriterion("delete_flag not like", value, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagIn(List<String> values) {
|
||||||
|
addCriterion("delete_flag in", values, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotIn(List<String> values) {
|
||||||
|
addCriterion("delete_flag not in", values, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagBetween(String value1, String value2) {
|
||||||
|
addCriterion("delete_flag between", value1, value2, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
|
||||||
|
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
|
||||||
|
return (Criteria) this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Criteria extends GeneratedCriteria {
|
public static class Criteria extends GeneratedCriteria {
|
||||||
|
|||||||
@ -11,6 +11,7 @@
|
|||||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||||
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
|
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
|
||||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Example_Where_Clause">
|
<sql id="Example_Where_Clause">
|
||||||
<where>
|
<where>
|
||||||
@ -72,7 +73,7 @@
|
|||||||
</sql>
|
</sql>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
id, tenant_id, login_name, user_num_limit, type, enabled, create_time, expire_time,
|
id, tenant_id, login_name, user_num_limit, type, enabled, create_time, expire_time,
|
||||||
remark
|
remark, delete_flag
|
||||||
</sql>
|
</sql>
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultMap="BaseResultMap">
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
@ -107,12 +108,12 @@
|
|||||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Tenant">
|
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Tenant">
|
||||||
insert into jsh_tenant (id, tenant_id, login_name,
|
insert into jsh_tenant (id, tenant_id, login_name,
|
||||||
user_num_limit, type, enabled,
|
user_num_limit, type, enabled,
|
||||||
create_time, expire_time, remark
|
create_time, expire_time, remark,
|
||||||
)
|
delete_flag)
|
||||||
values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR},
|
values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR},
|
||||||
#{userNumLimit,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
|
#{userNumLimit,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
|
||||||
#{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
|
#{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
|
||||||
)
|
#{deleteFlag,jdbcType=VARCHAR})
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Tenant">
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Tenant">
|
||||||
insert into jsh_tenant
|
insert into jsh_tenant
|
||||||
@ -144,6 +145,9 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
remark,
|
remark,
|
||||||
</if>
|
</if>
|
||||||
|
<if test="deleteFlag != null">
|
||||||
|
delete_flag,
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
@ -173,6 +177,9 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
#{remark,jdbcType=VARCHAR},
|
#{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="deleteFlag != null">
|
||||||
|
#{deleteFlag,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultType="java.lang.Long">
|
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultType="java.lang.Long">
|
||||||
@ -211,6 +218,9 @@
|
|||||||
<if test="record.remark != null">
|
<if test="record.remark != null">
|
||||||
remark = #{record.remark,jdbcType=VARCHAR},
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="record.deleteFlag != null">
|
||||||
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</set>
|
</set>
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
@ -226,7 +236,8 @@
|
|||||||
enabled = #{record.enabled,jdbcType=BIT},
|
enabled = #{record.enabled,jdbcType=BIT},
|
||||||
create_time = #{record.createTime,jdbcType=TIMESTAMP},
|
create_time = #{record.createTime,jdbcType=TIMESTAMP},
|
||||||
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
|
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
|
||||||
remark = #{record.remark,jdbcType=VARCHAR}
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
@ -258,6 +269,9 @@
|
|||||||
<if test="remark != null">
|
<if test="remark != null">
|
||||||
remark = #{remark,jdbcType=VARCHAR},
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="deleteFlag != null">
|
||||||
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
@ -270,7 +284,8 @@
|
|||||||
enabled = #{enabled,jdbcType=BIT},
|
enabled = #{enabled,jdbcType=BIT},
|
||||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||||
expire_time = #{expireTime,jdbcType=TIMESTAMP},
|
expire_time = #{expireTime,jdbcType=TIMESTAMP},
|
||||||
remark = #{remark,jdbcType=VARCHAR}
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
|
||||||
where id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@ -13,11 +13,12 @@
|
|||||||
<result column="phonenum" jdbcType="VARCHAR" property="phonenum" />
|
<result column="phonenum" jdbcType="VARCHAR" property="phonenum" />
|
||||||
<result column="ismanager" jdbcType="TINYINT" property="ismanager" />
|
<result column="ismanager" jdbcType="TINYINT" property="ismanager" />
|
||||||
<result column="isystem" jdbcType="TINYINT" property="isystem" />
|
<result column="isystem" jdbcType="TINYINT" property="isystem" />
|
||||||
<result column="Status" jdbcType="TINYINT" property="status" />
|
<result column="status" jdbcType="TINYINT" property="status" />
|
||||||
<result column="description" jdbcType="VARCHAR" property="description" />
|
<result column="description" jdbcType="VARCHAR" property="description" />
|
||||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||||
<result column="weixin_open_id" jdbcType="VARCHAR" property="weixinOpenId" />
|
<result column="weixin_open_id" jdbcType="VARCHAR" property="weixinOpenId" />
|
||||||
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
|
||||||
|
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Example_Where_Clause">
|
<sql id="Example_Where_Clause">
|
||||||
<where>
|
<where>
|
||||||
@ -79,7 +80,7 @@
|
|||||||
</sql>
|
</sql>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
id, username, login_name, password, leader_flag, position, department, email, phonenum,
|
id, username, login_name, password, leader_flag, position, department, email, phonenum,
|
||||||
ismanager, isystem, Status, description, remark, weixin_open_id, tenant_id
|
ismanager, isystem, status, description, remark, weixin_open_id, tenant_id, delete_flag
|
||||||
</sql>
|
</sql>
|
||||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
|
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
@ -115,15 +116,15 @@
|
|||||||
insert into jsh_user (id, username, login_name,
|
insert into jsh_user (id, username, login_name,
|
||||||
password, leader_flag, position,
|
password, leader_flag, position,
|
||||||
department, email, phonenum,
|
department, email, phonenum,
|
||||||
ismanager, isystem, Status,
|
ismanager, isystem, status,
|
||||||
description, remark, weixin_open_id,
|
description, remark, weixin_open_id,
|
||||||
tenant_id)
|
tenant_id, delete_flag)
|
||||||
values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
|
values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
|
||||||
#{password,jdbcType=VARCHAR}, #{leaderFlag,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
|
#{password,jdbcType=VARCHAR}, #{leaderFlag,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
|
||||||
#{department,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR},
|
#{department,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR},
|
||||||
#{ismanager,jdbcType=TINYINT}, #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
|
#{ismanager,jdbcType=TINYINT}, #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
|
||||||
#{description,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{weixinOpenId,jdbcType=VARCHAR},
|
#{description,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{weixinOpenId,jdbcType=VARCHAR},
|
||||||
#{tenantId,jdbcType=BIGINT})
|
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
|
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
|
||||||
insert into jsh_user
|
insert into jsh_user
|
||||||
@ -162,7 +163,7 @@
|
|||||||
isystem,
|
isystem,
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null">
|
<if test="status != null">
|
||||||
Status,
|
status,
|
||||||
</if>
|
</if>
|
||||||
<if test="description != null">
|
<if test="description != null">
|
||||||
description,
|
description,
|
||||||
@ -176,6 +177,9 @@
|
|||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id,
|
tenant_id,
|
||||||
</if>
|
</if>
|
||||||
|
<if test="deleteFlag != null">
|
||||||
|
delete_flag,
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
@ -226,6 +230,9 @@
|
|||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
#{tenantId,jdbcType=BIGINT},
|
#{tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="deleteFlag != null">
|
||||||
|
#{deleteFlag,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Long">
|
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultType="java.lang.Long">
|
||||||
@ -271,7 +278,7 @@
|
|||||||
isystem = #{record.isystem,jdbcType=TINYINT},
|
isystem = #{record.isystem,jdbcType=TINYINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.status != null">
|
<if test="record.status != null">
|
||||||
Status = #{record.status,jdbcType=TINYINT},
|
status = #{record.status,jdbcType=TINYINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="record.description != null">
|
<if test="record.description != null">
|
||||||
description = #{record.description,jdbcType=VARCHAR},
|
description = #{record.description,jdbcType=VARCHAR},
|
||||||
@ -285,6 +292,9 @@
|
|||||||
<if test="record.tenantId != null">
|
<if test="record.tenantId != null">
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="record.deleteFlag != null">
|
||||||
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</set>
|
</set>
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
@ -303,11 +313,12 @@
|
|||||||
phonenum = #{record.phonenum,jdbcType=VARCHAR},
|
phonenum = #{record.phonenum,jdbcType=VARCHAR},
|
||||||
ismanager = #{record.ismanager,jdbcType=TINYINT},
|
ismanager = #{record.ismanager,jdbcType=TINYINT},
|
||||||
isystem = #{record.isystem,jdbcType=TINYINT},
|
isystem = #{record.isystem,jdbcType=TINYINT},
|
||||||
Status = #{record.status,jdbcType=TINYINT},
|
status = #{record.status,jdbcType=TINYINT},
|
||||||
description = #{record.description,jdbcType=VARCHAR},
|
description = #{record.description,jdbcType=VARCHAR},
|
||||||
remark = #{record.remark,jdbcType=VARCHAR},
|
remark = #{record.remark,jdbcType=VARCHAR},
|
||||||
weixin_open_id = #{record.weixinOpenId,jdbcType=VARCHAR},
|
weixin_open_id = #{record.weixinOpenId,jdbcType=VARCHAR},
|
||||||
tenant_id = #{record.tenantId,jdbcType=BIGINT}
|
tenant_id = #{record.tenantId,jdbcType=BIGINT},
|
||||||
|
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
|
||||||
<if test="_parameter != null">
|
<if test="_parameter != null">
|
||||||
<include refid="Update_By_Example_Where_Clause" />
|
<include refid="Update_By_Example_Where_Clause" />
|
||||||
</if>
|
</if>
|
||||||
@ -346,7 +357,7 @@
|
|||||||
isystem = #{isystem,jdbcType=TINYINT},
|
isystem = #{isystem,jdbcType=TINYINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null">
|
<if test="status != null">
|
||||||
Status = #{status,jdbcType=TINYINT},
|
status = #{status,jdbcType=TINYINT},
|
||||||
</if>
|
</if>
|
||||||
<if test="description != null">
|
<if test="description != null">
|
||||||
description = #{description,jdbcType=VARCHAR},
|
description = #{description,jdbcType=VARCHAR},
|
||||||
@ -360,6 +371,9 @@
|
|||||||
<if test="tenantId != null">
|
<if test="tenantId != null">
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT},
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="deleteFlag != null">
|
||||||
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
@ -375,11 +389,12 @@
|
|||||||
phonenum = #{phonenum,jdbcType=VARCHAR},
|
phonenum = #{phonenum,jdbcType=VARCHAR},
|
||||||
ismanager = #{ismanager,jdbcType=TINYINT},
|
ismanager = #{ismanager,jdbcType=TINYINT},
|
||||||
isystem = #{isystem,jdbcType=TINYINT},
|
isystem = #{isystem,jdbcType=TINYINT},
|
||||||
Status = #{status,jdbcType=TINYINT},
|
status = #{status,jdbcType=TINYINT},
|
||||||
description = #{description,jdbcType=VARCHAR},
|
description = #{description,jdbcType=VARCHAR},
|
||||||
remark = #{remark,jdbcType=VARCHAR},
|
remark = #{remark,jdbcType=VARCHAR},
|
||||||
weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR},
|
weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR},
|
||||||
tenant_id = #{tenantId,jdbcType=BIGINT}
|
tenant_id = #{tenantId,jdbcType=BIGINT},
|
||||||
|
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
|
||||||
where id = #{id,jdbcType=BIGINT}
|
where id = #{id,jdbcType=BIGINT}
|
||||||
</update>
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
Loading…
Reference in New Issue
Block a user