purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给系统参数表增加多级审核开关字段，给用户表增加是否经理字段，默认为否

Browse Source
This commit is contained in:
季圣华
2023-02-20 00:14:34 +08:00
parent 5df9d972ce
commit 8b6afb1759
9 changed files with 224 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
jshERP-boot/src/main/resources/mapper_xml/UserMapper.xml
View File

@@ -6,6 +6,7 @@
<result column="username" jdbcType="VARCHAR" property="username" />
<result column="login_name" jdbcType="VARCHAR" property="loginName" />
<result column="password" jdbcType="VARCHAR" property="password" />
<result column="leader_flag" jdbcType="VARCHAR" property="leaderFlag" />
<result column="position" jdbcType="VARCHAR" property="position" />
<result column="department" jdbcType="VARCHAR" property="department" />
<result column="email" jdbcType="VARCHAR" property="email" />
@@ -76,8 +77,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, username, login_name, password, position, department, email, phonenum, ismanager,
isystem, Status, description, remark, tenant_id
id, username, login_name, password, leader_flag, position, department, email, phonenum,
ismanager, isystem, Status, description, remark, tenant_id
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
select
@@ -111,15 +112,17 @@
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.User">
insert into jsh_user (id, username, login_name,
password, position, department,
email, phonenum, ismanager,
isystem, Status, description,
remark, tenant_id)
password, leader_flag, position,
department, email, phonenum,
ismanager, isystem, Status,
description, remark, tenant_id
)
values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
#{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR},
#{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT},
#{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
#{password,jdbcType=VARCHAR}, #{leaderFlag,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
#{department,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR},
#{ismanager,jdbcType=TINYINT}, #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
#{description,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
insert into jsh_user
@@ -136,6 +139,9 @@
<if test="password != null">
password,
</if>
<if test="leaderFlag != null">
leader_flag,
</if>
<if test="position != null">
position,
</if>
@@ -180,6 +186,9 @@
<if test="password != null">
#{password,jdbcType=VARCHAR},
</if>
<if test="leaderFlag != null">
#{leaderFlag,jdbcType=VARCHAR},
</if>
<if test="position != null">
#{position,jdbcType=VARCHAR},
</if>
@@ -233,6 +242,9 @@
<if test="record.password != null">
password = #{record.password,jdbcType=VARCHAR},
</if>
<if test="record.leaderFlag != null">
leader_flag = #{record.leaderFlag,jdbcType=VARCHAR},
</if>
<if test="record.position != null">
position = #{record.position,jdbcType=VARCHAR},
</if>
@@ -274,6 +286,7 @@
username = #{record.username,jdbcType=VARCHAR},
login_name = #{record.loginName,jdbcType=VARCHAR},
password = #{record.password,jdbcType=VARCHAR},
leader_flag = #{record.leaderFlag,jdbcType=VARCHAR},
position = #{record.position,jdbcType=VARCHAR},
department = #{record.department,jdbcType=VARCHAR},
email = #{record.email,jdbcType=VARCHAR},
@@ -300,6 +313,9 @@
<if test="password != null">
password = #{password,jdbcType=VARCHAR},
</if>
<if test="leaderFlag != null">
leader_flag = #{leaderFlag,jdbcType=VARCHAR},
</if>
<if test="position != null">
position = #{position,jdbcType=VARCHAR},
</if>
@@ -338,6 +354,7 @@
set username = #{username,jdbcType=VARCHAR},
login_name = #{loginName,jdbcType=VARCHAR},
password = #{password,jdbcType=VARCHAR},
leader_flag = #{leaderFlag,jdbcType=VARCHAR},
position = #{position,jdbcType=VARCHAR},
department = #{department,jdbcType=VARCHAR},
email = #{email,jdbcType=VARCHAR},