From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除
---
src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
index 5e6e164..7183c5e 100644
--- a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
+++ b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
@@ -20,6 +20,7 @@
<result column="examination_mx" property="examination_mx"/>
<result column="audit_time" property="auditTime"/>
<result column="address" property="address"/>
+ <result column="team" property="team"/>
</resultMap>
@@ -44,15 +45,18 @@
<if test="zc.examination_type != null and zc.examination_type != '' ">
and examination_type = #{zc.examination_type}
</if>
+ <if test="zc.jurisdiction != null and zc.jurisdiction != '' ">
+ and (jurisdiction = #{zc.jurisdiction} or workjurisdiction = #{zc.jurisdiction})
+ </if>
and type != 1 ORDER BY zctime DESC
</select>
<!--注册新增-->
<insert id="inster" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
- insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid,address)
+ insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid,address,workaddress, workjurisdiction, signals,job_unit,team)
values (#{username}, #{password}, #{sname}, #{sex}, #{phone}, #{zctime}, #{deptid}, #{parentId},
- #{jurisdiction}, #{cardid},#{address})
+ #{jurisdiction}, #{cardid},#{address},#{workaddress},#{workjurisdiction},#{signals},#{jobUnit},#{team})
</insert>
<select id="selectType" resultType="String">
@@ -61,6 +65,14 @@
where username = #{param1}
</select>
+ <update id="updateExamine">
+ update act_zc set type=1 where id in (${ids});
+ update blade_user set stype=1,firstlogin = "1" where account in
+ <foreach collection="names" index="index" item="item" open="(" separator="," close=")">
+ "${item}"
+ </foreach>
+ </update>
+
<select id="selecyZcCount" resultType="java.lang.Integer">
select count(*)
from act_zc
--
Gitblit v1.9.3