Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1

src/main/java/club/joylink/rtss/entity/SysAccountExample.java

@@ -395,66 +395,6 @@ public class SysAccountExample {
             return (Criteria) this;
         }
 
-        public Criteria andOrgIdIsNull() {
-            addCriterion("org_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdIsNotNull() {
-            addCriterion("org_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdEqualTo(Long value) {
-            addCriterion("org_id =", value, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdNotEqualTo(Long value) {
-            addCriterion("org_id <>", value, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdGreaterThan(Long value) {
-            addCriterion("org_id >", value, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("org_id >=", value, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdLessThan(Long value) {
-            addCriterion("org_id <", value, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdLessThanOrEqualTo(Long value) {
-            addCriterion("org_id <=", value, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdIn(List<Long> values) {
-            addCriterion("org_id in", values, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdNotIn(List<Long> values) {
-            addCriterion("org_id not in", values, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdBetween(Long value1, Long value2) {
-            addCriterion("org_id between", value1, value2, "orgId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgIdNotBetween(Long value1, Long value2) {
-            addCriterion("org_id not between", value1, value2, "orgId");
-            return (Criteria) this;
-        }
-
         public Criteria andNameIsNull() {
             addCriterion("`name` is null");
             return (Criteria) this;
@@ -1547,6 +1487,7 @@ public class SysAccountExample {
     }
 
     /**
+     *
      */
     public static class Criteria extends GeneratedCriteria {
 

src/main/java/club/joylink/rtss/services/SysUserService.java

@@ -85,6 +85,9 @@ public class SysUserService implements ISysUserService {
     @Autowired
     private QRCodeManager qrCodeManager;
 
+    /**
+     * @update 20221019 删除账号查询逻辑，去除绑定组织操作
+     */
     @Override
     public AccountVO findUserByAccountAndPassword(String account, String password, String project) {
         /* 先按手机号和邮箱查询 */
@@ -92,8 +95,6 @@ public class SysUserService implements ISysUserService {
         example.createCriteria().andMobileEqualTo(account).andPasswordEqualTo(password); // 手机号
         example.or().andEmailEqualTo(account).andPasswordEqualTo(password); // 邮箱
         List<SysAccount> users = this.sysAccountDAO.selectByExample(example);
-        Collection<Org> projectOrgs = iOrgService.findEntities(project, BusinessConsts.Org.Status.VALID);
-        Map<Long, Org> orgMap = projectOrgs.stream().collect(Collectors.toMap(Org::getId, Function.identity()));
         AccountVO accountVO = null;
         if (!CollectionUtils.isEmpty(users)) {
             accountVO = new AccountVO(users.get(0));
@@ -103,34 +104,10 @@ public class SysUserService implements ISysUserService {
             example.clear();
             example.createCriteria().andAccountEqualTo(account).andPasswordEqualTo(password);
             users = this.sysAccountDAO.selectByExample(example);
-            for (SysAccount user : users) { //只能有一个账号符合条件
-                if (user.getOrgId() == null) {
-                    if (accountVO != null) {
-                        log.error("账号[{}]信息异常", account);
-                        throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception("账号信息异常");
-                    }
-                    accountVO = new AccountVO(user);
-                } else {
-                    Org org = orgMap.get(user.getOrgId());
-                    if (org != null) { //该账号的组织包含在项目组织中
-                        if (accountVO != null) {
-                            log.error("账号[{}]信息异常", account);
-                            throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception("账号信息异常");
-                        }
-                        accountVO = new AccountVO(user);
-                    }
-                }
+            if (CollectionUtils.isEmpty(users)) {
+                throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception("账号信息异常");
             }
-        }
-        if (accountVO != null) {
-            Org topOrg;
-            if (accountVO.getOrgId() != null) {
-                topOrg = iOrgService.getEntity(accountVO.getOrgId());
-            } else {
-                topOrg = iOrgService.findTopOrgOfUser(accountVO.getId());
-            }
-            /* 如果用户属于该顶级组织，设置相关属性 */
-            setOrgInfoOfThisOrg(topOrg, accountVO);
+            accountVO = new AccountVO(users.get(0));
         }
         return accountVO;
     }
@@ -179,7 +156,7 @@ public class SysUserService implements ISysUserService {
     @Override
     public SysAccount findEntity(@NonNull String account, long orgId) {
         SysAccountExample example = new SysAccountExample();
-        example.createCriteria().andAccountEqualTo(account).andOrgIdEqualTo(orgId);
+        example.createCriteria().andAccountEqualTo(account);
         List<SysAccount> users = sysAccountDAO.selectByExample(example);
         if (CollectionUtils.isEmpty(users)) {
             return null;
@@ -191,7 +168,7 @@ public class SysUserService implements ISysUserService {
     @Override
     public boolean isExist(@NonNull String account, long orgId) {
         SysAccountExample example = new SysAccountExample();
-        example.createCriteria().andAccountEqualTo(account).andOrgIdEqualTo(orgId);
+        example.createCriteria().andAccountEqualTo(account);
         return sysAccountDAO.countByExample(example) > 0;
     }
 

src/main/java/club/joylink/rtss/services/auth/AuthenticateService.java

@@ -233,6 +233,9 @@ public class AuthenticateService implements IAuthenticateService {
         }
     }
 
+    /**
+     * @update 20221019 去除设置组织信息
+     */
     @Override
     public void wmConfirmClientLogin(String code, String state) {
         LoginScanParam param = LoginScanParam.parse(state);
@@ -249,7 +252,7 @@ public class AuthenticateService implements IAuthenticateService {
                     LoginUserInfoVO loginUserInfo = new LoginUserInfoVO(user, loginStatusVo.getClient(),
                             loginStatusVo.getProjectVO().name(), loginStatusVo.getDeviceVO());
                     // 设置组织信息
-                    iSysUserService.setOrgInfoOfOrgRelWithTheProject(loginUserInfo.getProjectInfo().name(), user);
+                    // iSysUserService.setOrgInfoOfOrgRelWithTheProject(loginUserInfo.getProjectInfo().name(), user);
                     // 登陆
                     login(loginUserInfo, true);
                     // 更新登陆状态

src/main/java/club/joylink/rtss/services/org/OrgUserService.java

@@ -463,12 +463,12 @@ public class OrgUserService implements IOrgUserService {
      * @param topOrg       导入的组织所属的顶级组织
      * @param orgId        要导入的组织
      * @param orgUserIdSet 导入的组织当前已有的成员
+     * @update 20221019    创建用户时去除组织ID account.setOrgId(topOrg.getId());
      */
     private void importOrgUser(Org topOrg, Long orgId, Set<Long> orgUserIdSet, ImportOrgUserVO importOrgUser) {
         SysAccount user = iSysUserService.findEntity(importOrgUser.getAccount(), topOrg.getId());
         if (user == null) {
             SysAccount account = importOrgUser.convert2DB();
-            account.setOrgId(topOrg.getId());
             iSysUserService.createUser(account);
             create(orgId, account.getId(), BusinessConsts.OrgRole.Student);
         } else {

src/main/resources/mybatis/mapper/SysAccountDAO.xml

@@ -1,465 +1,454 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="club.joylink.rtss.dao.SysAccountDAO">
-  <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.SysAccount">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="account" jdbcType="VARCHAR" property="account" />
-    <result column="parent_account" jdbcType="VARCHAR" property="parentAccount" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="org_id" jdbcType="BIGINT" property="orgId" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="nickname" jdbcType="VARCHAR" property="nickname" />
-    <result column="avatar_path" jdbcType="VARCHAR" property="avatarPath" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
-    <result column="nationcode" jdbcType="VARCHAR" property="nationcode" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
-    <result column="wx_id" jdbcType="VARCHAR" property="wxId" />
-    <result column="wx_union_id" jdbcType="VARCHAR" property="wxUnionId" />
-    <result column="wm_open_id" jdbcType="VARCHAR" property="wmOpenId" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="roles" jdbcType="VARCHAR" property="roles" />
-    <result column="source" jdbcType="VARCHAR" property="source" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
+    <resultMap id="BaseResultMap" type="club.joylink.rtss.entity.SysAccount">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="account" jdbcType="VARCHAR" property="account"/>
+        <result column="parent_account" jdbcType="VARCHAR" property="parentAccount"/>
+        <result column="type" jdbcType="VARCHAR" property="type"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="nickname" jdbcType="VARCHAR" property="nickname"/>
+        <result column="avatar_path" jdbcType="VARCHAR" property="avatarPath"/>
+        <result column="password" jdbcType="VARCHAR" property="password"/>
+        <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
+        <result column="nationcode" jdbcType="VARCHAR" property="nationcode"/>
+        <result column="email" jdbcType="VARCHAR" property="email"/>
+        <result column="wx_id" jdbcType="VARCHAR" property="wxId"/>
+        <result column="wx_union_id" jdbcType="VARCHAR" property="wxUnionId"/>
+        <result column="wm_open_id" jdbcType="VARCHAR" property="wmOpenId"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="roles" jdbcType="VARCHAR" property="roles"/>
+        <result column="source" jdbcType="VARCHAR" property="source"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+    </resultMap>
+    <sql id="Example_Where_Clause">
+        <where>
+            <foreach collection="oredCriteria" item="criteria" separator="or">
+                <if test="criteria.valid">
+                    <trim prefix="(" prefixOverrides="and" suffix=")">
+                        <foreach collection="criteria.criteria" item="criterion">
+                            <choose>
+                                <when test="criterion.noValue">
+                                    and ${criterion.condition}
+                                </when>
+                                <when test="criterion.singleValue">
+                                    and ${criterion.condition} #{criterion.value}
+                                </when>
+                                <when test="criterion.betweenValue">
+                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                                </when>
+                                <when test="criterion.listValue">
+                                    and ${criterion.condition}
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
+                                             separator=",">
+                                        #{listItem}
+                                    </foreach>
+                                </when>
+                            </choose>
+                        </foreach>
+                    </trim>
+                </if>
             </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
+        </where>
+    </sql>
+    <sql id="Update_By_Example_Where_Clause">
+        <where>
+            <foreach collection="example.oredCriteria" item="criteria" separator="or">
+                <if test="criteria.valid">
+                    <trim prefix="(" prefixOverrides="and" suffix=")">
+                        <foreach collection="criteria.criteria" item="criterion">
+                            <choose>
+                                <when test="criterion.noValue">
+                                    and ${criterion.condition}
+                                </when>
+                                <when test="criterion.singleValue">
+                                    and ${criterion.condition} #{criterion.value}
+                                </when>
+                                <when test="criterion.betweenValue">
+                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                                </when>
+                                <when test="criterion.listValue">
+                                    and ${criterion.condition}
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
+                                             separator=",">
+                                        #{listItem}
+                                    </foreach>
+                                </when>
+                            </choose>
+                        </foreach>
+                    </trim>
+                </if>
             </foreach>
-          </trim>
+        </where>
+    </sql>
+    <sql id="Base_Column_List">
+        id, account, parent_account, `type`, `name`, nickname, avatar_path, `password`,
+        mobile, nationcode, email, wx_id, wx_union_id, wm_open_id, `status`, roles, `source`,
+        create_time, update_user_id, update_time
+    </sql>
+    <select id="selectByExample" parameterType="club.joylink.rtss.entity.SysAccountExample" resultMap="BaseResultMap">
+        select
+        <if test="distinct">
+            distinct
         </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, account, parent_account, `type`, org_id, `name`, nickname, avatar_path, `password`, 
-    mobile, nationcode, email, wx_id, wx_union_id, wm_open_id, `status`, roles, `source`, 
-    create_time, update_user_id, update_time
-  </sql>
-  <select id="selectByExample" parameterType="club.joylink.rtss.entity.SysAccountExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from sys_account
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from sys_account
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from sys_account
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.SysAccountExample">
-    delete from sys_account
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.SysAccount" useGeneratedKeys="true">
-    insert into sys_account (account, parent_account, `type`, 
-      org_id, `name`, nickname, 
-      avatar_path, `password`, mobile, 
-      nationcode, email, wx_id, 
-      wx_union_id, wm_open_id, `status`, 
-      roles, `source`, create_time, 
-      update_user_id, update_time)
-    values (#{account,jdbcType=VARCHAR}, #{parentAccount,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{orgId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, 
-      #{avatarPath,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, 
-      #{nationcode,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{wxId,jdbcType=VARCHAR}, 
-      #{wxUnionId,jdbcType=VARCHAR}, #{wmOpenId,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
-      #{roles,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateUserId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.SysAccount" useGeneratedKeys="true">
-    insert into sys_account
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="account != null">
-        account,
-      </if>
-      <if test="parentAccount != null">
-        parent_account,
-      </if>
-      <if test="type != null">
-        `type`,
-      </if>
-      <if test="orgId != null">
-        org_id,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="nickname != null">
-        nickname,
-      </if>
-      <if test="avatarPath != null">
-        avatar_path,
-      </if>
-      <if test="password != null">
-        `password`,
-      </if>
-      <if test="mobile != null">
-        mobile,
-      </if>
-      <if test="nationcode != null">
-        nationcode,
-      </if>
-      <if test="email != null">
-        email,
-      </if>
-      <if test="wxId != null">
-        wx_id,
-      </if>
-      <if test="wxUnionId != null">
-        wx_union_id,
-      </if>
-      <if test="wmOpenId != null">
-        wm_open_id,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="roles != null">
-        roles,
-      </if>
-      <if test="source != null">
-        `source`,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateUserId != null">
-        update_user_id,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="account != null">
-        #{account,jdbcType=VARCHAR},
-      </if>
-      <if test="parentAccount != null">
-        #{parentAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="orgId != null">
-        #{orgId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null">
-        #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="avatarPath != null">
-        #{avatarPath,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="mobile != null">
-        #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="nationcode != null">
-        #{nationcode,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="wxId != null">
-        #{wxId,jdbcType=VARCHAR},
-      </if>
-      <if test="wxUnionId != null">
-        #{wxUnionId,jdbcType=VARCHAR},
-      </if>
-      <if test="wmOpenId != null">
-        #{wmOpenId,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="roles != null">
-        #{roles,jdbcType=VARCHAR},
-      </if>
-      <if test="source != null">
-        #{source,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUserId != null">
-        #{updateUserId,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="club.joylink.rtss.entity.SysAccountExample" resultType="java.lang.Long">
-    select count(*) from sys_account
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update sys_account
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.account != null">
+        <include refid="Base_Column_List"/>
+        from sys_account
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause"/>
+        </if>
+        <if test="orderByClause != null">
+            order by ${orderByClause}
+        </if>
+        <if test="limit != null">
+            <if test="offset != null">
+                limit ${offset}, ${limit}
+            </if>
+            <if test="offset == null">
+                limit ${limit}
+            </if>
+        </if>
+    </select>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sys_account
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from sys_account
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+    <delete id="deleteByExample" parameterType="club.joylink.rtss.entity.SysAccountExample">
+        delete from sys_account
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause"/>
+        </if>
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.SysAccount"
+            useGeneratedKeys="true">
+        insert into sys_account (account, parent_account, `type`,
+        `name`, nickname,
+        avatar_path, `password`, mobile,
+        nationcode, email, wx_id,
+        wx_union_id, wm_open_id, `status`,
+        roles, `source`, create_time,
+        update_user_id, update_time)
+        values (#{account,jdbcType=VARCHAR}, #{parentAccount,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
+        #{name,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR},
+        #{avatarPath,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
+        #{nationcode,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{wxId,jdbcType=VARCHAR},
+        #{wxUnionId,jdbcType=VARCHAR}, #{wmOpenId,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
+        #{roles,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+        #{updateUserId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP})
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.SysAccount"
+            useGeneratedKeys="true">
+        insert into sys_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="account != null">
+                account,
+            </if>
+            <if test="parentAccount != null">
+                parent_account,
+            </if>
+            <if test="type != null">
+                `type`,
+            </if>
+            <if test="name != null">
+                `name`,
+            </if>
+            <if test="nickname != null">
+                nickname,
+            </if>
+            <if test="avatarPath != null">
+                avatar_path,
+            </if>
+            <if test="password != null">
+                `password`,
+            </if>
+            <if test="mobile != null">
+                mobile,
+            </if>
+            <if test="nationcode != null">
+                nationcode,
+            </if>
+            <if test="email != null">
+                email,
+            </if>
+            <if test="wxId != null">
+                wx_id,
+            </if>
+            <if test="wxUnionId != null">
+                wx_union_id,
+            </if>
+            <if test="wmOpenId != null">
+                wm_open_id,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+            <if test="roles != null">
+                roles,
+            </if>
+            <if test="source != null">
+                `source`,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateUserId != null">
+                update_user_id,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="account != null">
+                #{account,jdbcType=VARCHAR},
+            </if>
+            <if test="parentAccount != null">
+                #{parentAccount,jdbcType=VARCHAR},
+            </if>
+            <if test="type != null">
+                #{type,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="nickname != null">
+                #{nickname,jdbcType=VARCHAR},
+            </if>
+            <if test="avatarPath != null">
+                #{avatarPath,jdbcType=VARCHAR},
+            </if>
+            <if test="password != null">
+                #{password,jdbcType=VARCHAR},
+            </if>
+            <if test="mobile != null">
+                #{mobile,jdbcType=VARCHAR},
+            </if>
+            <if test="nationcode != null">
+                #{nationcode,jdbcType=VARCHAR},
+            </if>
+            <if test="email != null">
+                #{email,jdbcType=VARCHAR},
+            </if>
+            <if test="wxId != null">
+                #{wxId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxUnionId != null">
+                #{wxUnionId,jdbcType=VARCHAR},
+            </if>
+            <if test="wmOpenId != null">
+                #{wmOpenId,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=VARCHAR},
+            </if>
+            <if test="roles != null">
+                #{roles,jdbcType=VARCHAR},
+            </if>
+            <if test="source != null">
+                #{source,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUserId != null">
+                #{updateUserId,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <select id="countByExample" parameterType="club.joylink.rtss.entity.SysAccountExample" resultType="java.lang.Long">
+        select count(*) from sys_account
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause"/>
+        </if>
+    </select>
+    <update id="updateByExampleSelective" parameterType="map">
+        update sys_account
+        <set>
+            <if test="record.id != null">
+                id = #{record.id,jdbcType=BIGINT},
+            </if>
+            <if test="record.account != null">
+                account = #{record.account,jdbcType=VARCHAR},
+            </if>
+            <if test="record.parentAccount != null">
+                parent_account = #{record.parentAccount,jdbcType=VARCHAR},
+            </if>
+            <if test="record.type != null">
+                `type` = #{record.type,jdbcType=VARCHAR},
+            </if>
+            <if test="record.name != null">
+                `name` = #{record.name,jdbcType=VARCHAR},
+            </if>
+            <if test="record.nickname != null">
+                nickname = #{record.nickname,jdbcType=VARCHAR},
+            </if>
+            <if test="record.avatarPath != null">
+                avatar_path = #{record.avatarPath,jdbcType=VARCHAR},
+            </if>
+            <if test="record.password != null">
+                `password` = #{record.password,jdbcType=VARCHAR},
+            </if>
+            <if test="record.mobile != null">
+                mobile = #{record.mobile,jdbcType=VARCHAR},
+            </if>
+            <if test="record.nationcode != null">
+                nationcode = #{record.nationcode,jdbcType=VARCHAR},
+            </if>
+            <if test="record.email != null">
+                email = #{record.email,jdbcType=VARCHAR},
+            </if>
+            <if test="record.wxId != null">
+                wx_id = #{record.wxId,jdbcType=VARCHAR},
+            </if>
+            <if test="record.wxUnionId != null">
+                wx_union_id = #{record.wxUnionId,jdbcType=VARCHAR},
+            </if>
+            <if test="record.wmOpenId != null">
+                wm_open_id = #{record.wmOpenId,jdbcType=VARCHAR},
+            </if>
+            <if test="record.status != null">
+                `status` = #{record.status,jdbcType=VARCHAR},
+            </if>
+            <if test="record.roles != null">
+                roles = #{record.roles,jdbcType=VARCHAR},
+            </if>
+            <if test="record.source != null">
+                `source` = #{record.source,jdbcType=VARCHAR},
+            </if>
+            <if test="record.createTime != null">
+                create_time = #{record.createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="record.updateUserId != null">
+                update_user_id = #{record.updateUserId,jdbcType=BIGINT},
+            </if>
+            <if test="record.updateTime != null">
+                update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        <if test="_parameter != null">
+            <include refid="Update_By_Example_Where_Clause"/>
+        </if>
+    </update>
+    <update id="updateByExample" parameterType="map">
+        update sys_account
+        set id = #{record.id,jdbcType=BIGINT},
         account = #{record.account,jdbcType=VARCHAR},
-      </if>
-      <if test="record.parentAccount != null">
         parent_account = #{record.parentAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
         `type` = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.orgId != null">
-        org_id = #{record.orgId,jdbcType=BIGINT},
-      </if>
-      <if test="record.name != null">
         `name` = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.nickname != null">
         nickname = #{record.nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.avatarPath != null">
         avatar_path = #{record.avatarPath,jdbcType=VARCHAR},
-      </if>
-      <if test="record.password != null">
         `password` = #{record.password,jdbcType=VARCHAR},
-      </if>
-      <if test="record.mobile != null">
         mobile = #{record.mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="record.nationcode != null">
         nationcode = #{record.nationcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.email != null">
         email = #{record.email,jdbcType=VARCHAR},
-      </if>
-      <if test="record.wxId != null">
         wx_id = #{record.wxId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.wxUnionId != null">
         wx_union_id = #{record.wxUnionId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.wmOpenId != null">
         wm_open_id = #{record.wmOpenId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
         `status` = #{record.status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.roles != null">
         roles = #{record.roles,jdbcType=VARCHAR},
-      </if>
-      <if test="record.source != null">
         `source` = #{record.source,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.updateUserId != null">
         update_user_id = #{record.updateUserId,jdbcType=BIGINT},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update sys_account
-    set id = #{record.id,jdbcType=BIGINT},
-      account = #{record.account,jdbcType=VARCHAR},
-      parent_account = #{record.parentAccount,jdbcType=VARCHAR},
-      `type` = #{record.type,jdbcType=VARCHAR},
-      org_id = #{record.orgId,jdbcType=BIGINT},
-      `name` = #{record.name,jdbcType=VARCHAR},
-      nickname = #{record.nickname,jdbcType=VARCHAR},
-      avatar_path = #{record.avatarPath,jdbcType=VARCHAR},
-      `password` = #{record.password,jdbcType=VARCHAR},
-      mobile = #{record.mobile,jdbcType=VARCHAR},
-      nationcode = #{record.nationcode,jdbcType=VARCHAR},
-      email = #{record.email,jdbcType=VARCHAR},
-      wx_id = #{record.wxId,jdbcType=VARCHAR},
-      wx_union_id = #{record.wxUnionId,jdbcType=VARCHAR},
-      wm_open_id = #{record.wmOpenId,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
-      roles = #{record.roles,jdbcType=VARCHAR},
-      `source` = #{record.source,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_user_id = #{record.updateUserId,jdbcType=BIGINT},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.SysAccount">
-    update sys_account
-    <set>
-      <if test="account != null">
-        account = #{account,jdbcType=VARCHAR},
-      </if>
-      <if test="parentAccount != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+        <if test="_parameter != null">
+            <include refid="Update_By_Example_Where_Clause"/>
+        </if>
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.SysAccount">
+        update sys_account
+        <set>
+            <if test="account != null">
+                account = #{account,jdbcType=VARCHAR},
+            </if>
+            <if test="parentAccount != null">
+                parent_account = #{parentAccount,jdbcType=VARCHAR},
+            </if>
+            <if test="type != null">
+                `type` = #{type,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                `name` = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="nickname != null">
+                nickname = #{nickname,jdbcType=VARCHAR},
+            </if>
+            <if test="avatarPath != null">
+                avatar_path = #{avatarPath,jdbcType=VARCHAR},
+            </if>
+            <if test="password != null">
+                `password` = #{password,jdbcType=VARCHAR},
+            </if>
+            <if test="mobile != null">
+                mobile = #{mobile,jdbcType=VARCHAR},
+            </if>
+            <if test="nationcode != null">
+                nationcode = #{nationcode,jdbcType=VARCHAR},
+            </if>
+            <if test="email != null">
+                email = #{email,jdbcType=VARCHAR},
+            </if>
+            <if test="wxId != null">
+                wx_id = #{wxId,jdbcType=VARCHAR},
+            </if>
+            <if test="wxUnionId != null">
+                wx_union_id = #{wxUnionId,jdbcType=VARCHAR},
+            </if>
+            <if test="wmOpenId != null">
+                wm_open_id = #{wmOpenId,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=VARCHAR},
+            </if>
+            <if test="roles != null">
+                roles = #{roles,jdbcType=VARCHAR},
+            </if>
+            <if test="source != null">
+                `source` = #{source,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUserId != null">
+                update_user_id = #{updateUserId,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.SysAccount">
+        update sys_account
+        set account = #{account,jdbcType=VARCHAR},
         parent_account = #{parentAccount,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
         `type` = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="orgId != null">
-        org_id = #{orgId,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null">
         nickname = #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="avatarPath != null">
         avatar_path = #{avatarPath,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
         `password` = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="mobile != null">
         mobile = #{mobile,jdbcType=VARCHAR},
-      </if>
-      <if test="nationcode != null">
         nationcode = #{nationcode,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
         email = #{email,jdbcType=VARCHAR},
-      </if>
-      <if test="wxId != null">
         wx_id = #{wxId,jdbcType=VARCHAR},
-      </if>
-      <if test="wxUnionId != null">
         wx_union_id = #{wxUnionId,jdbcType=VARCHAR},
-      </if>
-      <if test="wmOpenId != null">
         wm_open_id = #{wmOpenId,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
         `status` = #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="roles != null">
         roles = #{roles,jdbcType=VARCHAR},
-      </if>
-      <if test="source != null">
         `source` = #{source,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUserId != null">
         update_user_id = #{updateUserId,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.SysAccount">
-    update sys_account
-    set account = #{account,jdbcType=VARCHAR},
-      parent_account = #{parentAccount,jdbcType=VARCHAR},
-      `type` = #{type,jdbcType=VARCHAR},
-      org_id = #{orgId,jdbcType=BIGINT},
-      `name` = #{name,jdbcType=VARCHAR},
-      nickname = #{nickname,jdbcType=VARCHAR},
-      avatar_path = #{avatarPath,jdbcType=VARCHAR},
-      `password` = #{password,jdbcType=VARCHAR},
-      mobile = #{mobile,jdbcType=VARCHAR},
-      nationcode = #{nationcode,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR},
-      wx_id = #{wxId,jdbcType=VARCHAR},
-      wx_union_id = #{wxUnionId,jdbcType=VARCHAR},
-      wm_open_id = #{wmOpenId,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
-      roles = #{roles,jdbcType=VARCHAR},
-      `source` = #{source,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_user_id = #{updateUserId,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+        update_time = #{updateTime,jdbcType=TIMESTAMP}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
 </mapper>