Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-30 5667d14c708f9244fe2419707f98ff472ca23480

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -24,9 +24,16 @@
        <result property="updateTime"   column="update_time"  />
      <result property="contacts"   column="contacts"  />
        <result property="remark"       column="remark"       />
        <result property="roleType"       column="roleType"       />
        <result property="objectId"       column="objectId"       />
        <result property="provinceName"       column="province_name"       />
        <result property="provinceCode"       column="province_code"       />
        <result property="cityName"       column="city_name"       />
        <result property="cityCode"       column="city_code"       />
        <result property="countyName"       column="county_name"       />
        <result property="countyCode"       column="county_code"       />
        <result property="townName"       column="town_name"       />
        <result property="townCode"       column="town_code"       />
         <result property="userType" column="user_type"/>
         <result property="roleType" column="roleType"/>
        <association property="dept"    column="dept_id" javaType="com.ruoyi.system.api.domain.SysDept" resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
    </resultMap>
@@ -52,14 +59,22 @@
   
   <sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
        d.dept_id, d.dept_name,u.contacts,u.province_name,u.province_code,u.city_name,u.city_code,u.county_name,u.county_code,u.town_name,u.town_code,
        d.dept_id, d.dept_name,u.contacts,
        u.province_name ,
        u.province_code ,
        u.city_name ,
        u.city_code ,
        u.county_name ,
        u.county_code ,
        u.town_name ,
        u.town_code ,
                      r.role_id,
                      r.role_name,
                      r.role_key,
                      r.role_sort,
                      r.data_scope,
                      r.status   as role_status,
                      u.roleType as roleType,
                      u.roleType,
                      u.objectId AS objectId,
                      u.user_type
        from sys_user u