更新代码

puzhibing

2022-10-12 448ffdc100aade7aa1f440923abdd8ff561b4b72

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml

@@ -9,7 +9,8 @@
      <result column="account" property="account" />
      <result column="password" property="password" />
      <result column="salt" property="salt" />
      <result column="name" property="name" />
      <result column="lastName" property="lastName" />
      <result column="firstName" property="firstName" />
      <result column="birthday" property="birthday" />
      <result column="sex" property="sex" />
      <result column="email" property="email" />
@@ -22,14 +23,14 @@
   </resultMap>

   <sql id="Base_Column_List">
      id, account, name, birthday, sex, email, avatar,
      id, account, lastName, firstName, birthday, sex, email, avatar,
      phone, roleid,
      deptid, status,
      createtime, version
   </sql>

   <sql id="Base_Column_List_With_Pwd">
      id, account, name, birthday,password, sex, email, avatar,
      id, account, lastName, firstName, birthday,password, sex, email, avatar,
      phone, roleid,salt,
      deptid, status,
      createtime, version
@@ -43,7 +44,8 @@
      <if test="name != null and name != ''">
         and (phone like CONCAT('%',#{name},'%')
         or account like CONCAT('%',#{name},'%')
         or name like CONCAT('%',#{name},'%'))
         or lastName like CONCAT('%',#{name},'%')
         or firstName like CONCAT('%',#{name},'%'))
      </if>
      <if test="deptid != null and deptid != 0">
         and (deptid = #{deptid} or deptid in ( select id from sys_dept where pids like CONCAT('%[', #{deptid}, ']%') ))