jinpengyong
2021-04-26 0702c48c75bb909df85af96d162828b6b982bb10
screen-api/src/main/resources/mapper/UserMapper.xml
@@ -25,7 +25,7 @@
            <result column="id" property="id" jdbcType="INTEGER"/>
            <result column="name" property="name" jdbcType="VARCHAR"/>
            <result column="location_level_code" property="locationLevelCode"/>
            <result column="org_expire_ime" property="expireTime"/>
            <result column="org_expire_time" property="expireTime"/>
        </association>
        <!--用户组-->
        <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
@@ -37,7 +37,7 @@
    <!--查询用户信息,包含组织,角色-->
    <select id="selectUserInfo" resultMap="userInfoMap">
      SELECT u.id, u.account, u.password, u.user_name, u.email, u.mobile, u.wechat ,u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
      o.name, o.location_level_code, o.expire_time org_expire_ime,
      o.name, o.location_level_code, o.expire_time org_expire_time,
      a.id group_id , a.group_name
      FROM `user` u
      LEFT JOIN