智慧保安后台管理-外网项目备份
tangzy
2021-07-30 a5232f5bb05a75445a1c8cbf218f7ba8057fa6af
1.用戶返回单位名称
2 files modified
71 ■■■■■ changed files
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 70 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/vo/UserVO.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -40,24 +40,26 @@
        <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
        bu.*,
        sll.longitude,sll.latitude,
        bd.dept_name as deptname
        from
            blade_user bu
        blade_user bu
        left join
            blade_dept bd
        blade_dept bd
        on
            bu.dept_id = bd.id
        bu.dept_id = bd.id
        left join
            sys_live_location sll
        sys_live_location sll
        on
            sll.worker_id = bu.id
        sll.worker_id = bu.id
        where
            bu.is_deleted = 0
        bu.is_deleted = 0
        <if test="tenantId!=null and tenantId != ''">
            and bu.tenant_id = #{tenantId}
        </if>
@@ -88,43 +90,54 @@
        <if test="user.userType!=null and user.userType != ''">
            and bu.user_type = #{user.userType}
        </if>
          <if test="user.securitynumber!=null and user.securitynumber != ''">
        <if test="user.securitynumber!=null and user.securitynumber != ''">
            and bu.securitynumber = #{user.securitynumber}
        </if>
        <if test="deptIdList!=null and deptIdList.size>0">
            and bu.id in (
                SELECT
                    user_id
                FROM
                    blade_user_dept
                WHERE
                dept_id IN
                <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            SELECT
            user_id
            FROM
            blade_user_dept
            WHERE
            dept_id IN
            <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
            )
        </if>
        ORDER BY bu.id
    </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 != ''">
src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -91,4 +91,5 @@
     * 纬度
     */
    private String latitude;
    private String deptname;
}