1.用戶返回单位名称

tangzy

2021-07-30 a5232f5bb05a75445a1c8cbf218f7ba8057fa6af

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -40,12 +40,14 @@
        <result column="jurisdiction" property="jurisdiction"/>
        <result column="securitynumber" property="securitynumber"/>
        <result column="dispatch" property="dispatch"/>
        <result column="deptname" property="deptname"/>
    </resultMap>

    <select id="selectUserPage" resultMap="userResultMap">
        select
            bu.*,
            sll.longitude,sll.latitude
        sll.longitude,sll.latitude,
        bd.dept_name as deptname
        from
            blade_user bu
        left join
@@ -108,23 +110,34 @@
    </select>

    <select id="getUser" resultMap="userResultMap">
        SELECT
            *
        FROM
            blade_user
        WHERE
            tenant_id = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
        SELECT *
        FROM blade_user
        WHERE tenant_id = #{param1}
          and account = #{param2}
          and password = #{param3}
          and is_deleted = 0
    </select>

    <select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
        SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
        SELECT id,
               tenant_id,
               user_type,
               account,
               name,
               real_name,
               email,
               phone,
               birthday,
               role_id,
               dept_id,
               post_id
        FROM blade_user ${ew.customSqlSegment}
    </select>

    <!--通过 身份证号查询用户信息-->
    <select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
        SELECT id, name, real_name RealName
            FROM
        blade_user
        FROM blade_user
        where cardid = #{param1}
    </select>
    <!--保安员列表-->
@@ -167,7 +180,8 @@
        </if>
        <if test="user.hold!=null and user.hold != ''">
            and bu.hold = #{user.hold}
        </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
        </if>
        <if test="user.jurisdiction!=null and user.jurisdiction != ''">
            and bu.jurisdiction = #{user.jurisdiction}
        </if>
        <if test="user.securitynumber!=null and user.securitynumber != ''">