Merge branch 'master-where标签替换'

陈昶聿

4 天以前 d2d33d9e10b6a68b84a43a1b970a94246ffdf801

 smartor/src/main/resources/mapper/smartor/SysUserMapper.xml

@@ -6,7 +6,6 @@

    <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
        <id property="userId" column="user_id"/>
        <id property="orgid" column="orgid"/>
        <id property="hisUserId" column="his_user_id"/>
        <result property="deptId" column="dept_id"/>
        <result property="userCode" column="user_code"/>
@@ -87,7 +86,6 @@
               u.create_time,
               u.remark,
               u.guid,
               u.orgid,
               d.dept_id,
               d.parent_id,
               d.ancestors,
@@ -102,6 +100,7 @@
               r.data_scope,
               r.status as role_status
        from sys_user u
                 left join sys_user_org o on o.user_id = u.user_id
                 left join sys_dept d on u.dept_id = d.dept_id
                 left join sys_user_role ur on u.user_id = ur.user_id
                 left join sys_role r on r.role_id = ur.role_id
@@ -114,7 +113,6 @@
        u.email,u.id_card,
        u.avatar,
        u.birthday,
        u.orgid,
        u.job_phone,
        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 from sys_user
@@ -173,7 +171,6 @@
        u.email,
        u.birthday,
        u.job_phone,
        u.orgid,
        u.phonenumber, u.status,u.id_card,
        u.create_time
        from sys_user u
@@ -205,7 +202,6 @@
        u.email,
        u.his_user_id,
        u.title,
        u.orgid,
        u.job_phone,
        u.birthday,
        u.phonenumber, u.status,u.id_card,
@@ -283,7 +279,6 @@
        <if test="birthday != null ">birthday,</if>
        <if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
        <if test="guid != null and guid != ''">guid,</if>
        <if test="orgid != null and orgid != ''">orgid,</if>
        <if test="deptCode != null and deptCode != ''">dept_code,</if>
        <if test="deptName != null and deptName != ''">dept_name,</if>
        <if test="userCode != null and userCode != ''">user_code,</if>
@@ -311,7 +306,6 @@
        <if test="birthday != null">#{birthday},</if>
        <if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
        <if test="guid != null and guid != ''">#{guid},</if>
        <if test="orgid != null and orgid != ''">#{orgid},</if>
        <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
        <if test="deptName != null and deptName != ''">#{deptName},</if>
        <if test="userCode != null and userCode != ''">#{userCode},</if>
@@ -324,7 +318,7 @@
        insert into sys_user(
        user_id, dept_id, user_name, nick_name, email, avatar, phonenumber, sex, password, status, create_by, remark,
        user_type, dept_info, hosp_info, searchscope, id_card, title, job_phone, birthday, his_user_id, guid,
        orgid,user_code,
        user_code,
        create_time
        ) values
        <foreach collection="list" item="item" separator=",">
@@ -351,7 +345,6 @@
            #{item.birthday},
            #{item.hisUserId},
            #{item.guid},
            #{item.orgid},
            #{item.userCode},
            now()
            )
@@ -381,7 +374,6 @@
            <if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
            <if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
            <if test="birthday != null ">birthday=#{birthday},</if>
            <if test="orgid != null ">orgid=#{orgid},</if>
            <if test="userCode != null ">user_code=#{userCode},</if>
            <if test="title != null and title != ''">
                title = #{title},