feat: 最新代码及配置

hjl

2024-07-26 f8cc44e926fd22f9d1d864dc684c827f6960270b

 ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/UserMapper.xml

@@ -21,7 +21,7 @@
        FROM t_user
        <where>
            <if test="city != null and city.size() != 0">
                city in
                city_code in
                <foreach collection="city" item="city" open="(" separator="," close=")">
                #{city}
                </foreach>
@@ -39,7 +39,7 @@
        WHERE YEAR(createTime) = YEAR(NOW())
          and is_delete = 0
        <if test="cityList != null and cityList.size() != 0">
            and city in
            and city_code in
            <foreach collection="cityList" item="city" open="(" separator="," close=")">
                #{city}
            </foreach>
@@ -52,10 +52,11 @@
        WHERE MONTH(createTime) = MONTH(NOW())
          AND YEAR(createTime) = YEAR(NOW())
        <if test="cityList != null and cityList.size() != 0">
            and city in
            and city_code in
            <foreach collection="cityList" item="city" open="(" separator="," close=")">
                #{city}
            </foreach>
        </if>
    </select>

</mapper>