Merge remote-tracking branch 'origin/xinghong-dev'

java110

2021-04-01 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387

 java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -535,7 +535,7 @@
    <select id="getUsers" parameterType="Map" resultType="Map">
        select u.user_id, u.user_id userId,u.name,u.name
        userName,u.email,u.address,u.password,u.location_cd,u.location_cd locationCd,
        u.age,u.sex,u.tel,u.level_cd,u.b_id
        u.age,u.sex,u.tel,u.level_cd,u.b_id,u.level_cd levelCd
        from u_user u
        <if test="openId != null and openId !=''">
            ,u_user_attr ua
@@ -596,6 +596,9 @@
        <if test="tel !=null and tel != ''">
            and u.tel= #{tel}
        </if>
        <if test="levelCd !=null and levelCd != ''">
            and u.level_cd= #{levelCd}
        </if>
        order by u.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}