调整系统模块

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -92,13 +92,11 @@ public class SysUserController {
         LoginUser loginUser = AuthContextUtils.getLoginUser();
         SysUser sysUser = new SysUser();
         sysUser.setId(loginUser.getUserId());
-        sysUser.setIcCard(param.getIcCard());
         sysUser.setEmerAddress(param.getEmerAddress());
         sysUser.setEmerName(param.getEmerName());
         sysUser.setEmerMobile(param.getEmerMobile());
         sysUser.setEmerRelate(param.getEmerRelate());
         sysUser.setEmerWorksapce(param.getEmerWorksapce());
-        sysUser.setCarNum(param.getCarNum());
         sysUser.setUpdateTime(LocalDateTime.now());
         sysUserService.updateById(sysUser);
         return R.ok();
@@ -341,7 +339,7 @@ public class SysUserController {
         SysPost post = sysPostService.getById(param.getPostId());
         SysUser sysUser = sysUserService.getById(param.getUserId());
         sysUser.setDeptId(post.getDeptId());
-        sysUser.setPositionId(post.getId());
+        sysUser.setPositionId(post.getId()+"");
         sysUserService.updateById(sysUser);
         return R.ok();
     }

src/main/java/com/qs/serve/modules/sys/entity/SysUser.java

@@ -12,8 +12,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.modules.sys.entity.dto.SysUserVo;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 系统用户 实体类
  * @author YenHex
@@ -30,38 +33,37 @@ public class SysUser implements Serializable {
     private String id;
 
     /** 手机号 */
+    @NotBlank(message = "手机号不能为空")
+    @Length(max = 64,message = "手机号长度不能超过64字")
     private String mobile;
 
     /** 账号 */
+    @Length(max = 64,message = "账号长度不能超过64字")
     private String account;
 
     /** 昵称 */
+    @Length(max = 64,message = "昵称长度不能超过64字")
     private String name;
 
     /** 编号/工号 */
+    @Length(max = 64,message = "编号/工号长度不能超过64字")
     private String code;
 
-    /** IC卡号 */
-    private String icCard;
-
-    /** 岗位 */
-    private Long positionId;
-
-    /** 职工类型【0->管理员；1->教师；2->职工】 */
-    private Integer positionType;
-
     /** 密码 */
-    @JsonIgnore
+    @Length(max = 64,message = "密码长度不能超过64字")
     private String password;
 
     /** 头像 */
+    @Length(max = 255,message = "头像长度不能超过255字")
     private String icon;
 
     /** 部门ID */
+    @Length(max = 64,message = "部门ID长度不能超过64字")
     private String deptId;
 
-    /** 人事管理类型 */
+    /** 职位ID */
-    private Integer hrType;
+    @Length(max = 64,message = "部门ID长度不能超过64字")
+    private String positionId;
 
     /** 超级管理标识【0->普通管理员；1->超级管理员】 */
     private Integer superFlag;
@@ -73,41 +75,14 @@ public class SysUser implements Serializable {
     private Integer servingState;
 
     /** 身份证号码 */
+    @Length(max = 45,message = "身份证号码长度不能超过45字")
     private String identityNo;
 
-    /** 购买五险 */
-    private Integer socStatus;
-
-    /** 是否第一次在五邑地区叁保 */
-    private Integer socFirstFlag;
-
-    /** 是否已有五邑地区社保卡 */
-    private Integer socCardFlag;
-
-    /** 购买社保时间 */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDate socStartDate;
-
-    /** 住房公积金信息【0->有江门本地公积金账号；1->有其它地方公积金账号；2->无公积金账号】 */
-    private Integer housingState;
-
-    /** 买住户公积金时间 */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private LocalDate housingStartDate;
-
     /** 入职日期 */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate enterDate;
 
-    /** 合同时间-开始时间 */
-    private LocalDate servingPactDate;
-
-    /** 合同时间-结束时间 */
-    private LocalDate servingPactDateEnd;
-
     /** 转正时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@@ -116,25 +91,28 @@ public class SysUser implements Serializable {
     /** 正式员工【0->试用期；1->正式】 */
     private Integer formalStatus;
 
-    /** 隐藏状态【0->显示；1->隐藏】 */
-    private Integer hideStatus;
-
     /** 备注 */
+    @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
 
     /** 紧急联系人名称 */
+    @Length(max = 255,message = "紧急联系人名称长度不能超过255字")
     private String emerName;
 
     /** 紧急联系人与本人关系 */
+    @Length(max = 255,message = "紧急联系人与本人关系长度不能超过255字")
     private String emerRelate;
 
     /** 紧急联系人电话 */
+    @Length(max = 500,message = "紧急联系人电话长度不能超过500字")
     private String emerMobile;
 
     /** 紧急联系人工作单位 */
+    @Length(max = 255,message = "紧急联系人工作单位长度不能超过255字")
     private String emerWorksapce;
 
     /** 紧急联系人住址 */
+    @Length(max = 255,message = "紧急联系人住址长度不能超过255字")
     private String emerAddress;
 
     /** 本地类型【0->本地；1->外地】 */
@@ -144,21 +122,27 @@ public class SysUser implements Serializable {
     private Integer houseType;
 
     /** 国籍 */
+    @Length(max = 45,message = "国籍长度不能超过45字")
     private String nation;
 
     /** 民族 */
+    @Length(max = 20,message = "民族长度不能超过20字")
     private String national;
 
     /** 籍贯 */
+    @Length(max = 45,message = "籍贯长度不能超过45字")
     private String nativePlace;
 
     /** 户籍所在地 */
+    @Length(max = 100,message = "户籍所在地长度不能超过100字")
     private String nativeAddress;
 
     /** 现居住详细地址 */
+    @Length(max = 100,message = "现居住详细地址长度不能超过100字")
     private String currAddress;
 
     /** 政治面貌 */
+    @Length(max = 20,message = "政治面貌长度不能超过20字")
     private String politicsStatus;
 
     /** 婚姻状态【0->未婚；1->已婚】 */
@@ -168,32 +152,29 @@ public class SysUser implements Serializable {
     private Integer gender;
 
     /** 出生年月日 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate birthday;
 
     /** 毕业学校 */
+    @Length(max = 255,message = "毕业学校长度不能超过255字")
     private String eduSchool;
 
-    /** 家用电话 */
+    /** 最高学历【0->未知；1->高中及以下；2->中专；3->大专；4->本科；5->硕士；6->博士】 */
-    private String homeCall;
-
-    /** 原单位登记号 */
-    private String orgRegistCode;
-
-    /** 车牌号 */
-    private String carNum;
-
-    /** 最高学历【0->未知；1->初中及以下；2->中专；3->大专；4->本科；5->研究生；6->硕士】 */
     private Integer eduLevel;
 
     /** 毕业专业 */
+    @Length(max = 255,message = "毕业专业长度不能超过255字")
     private String eduProfession;
 
-    /** 友盟推送token */
+    /** 登陆客户端标识：android，ios */
-    private String ymToken;
+    @Length(max = 20,message = "登陆客户端标识：android，ios长度不能超过20字")
-
-    /** 友盟推送appClient */
     private String appClient;
 
+    /** app推送token */
+    @Length(max = 255,message = "友盟推送token长度不能超过255字")
+    private String appToken;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -218,9 +199,11 @@ public class SysUser implements Serializable {
     @JsonIgnore
     private Boolean delFlag;
 
+    /** 校区id */
     @JsonIgnore
     private String tenantId;
 
+
     /** 查询参数 */
     @TableField(exist = false)
     private String searchValue;
@@ -277,7 +260,7 @@ public class SysUser implements Serializable {
      * @return
      */
     public SysUserVo toSysUserVo() {
-        return toSysUserVo(this.hideStatus==null||this.hideStatus.equals(1));
+        return toSysUserVo(true);
     }
 
     /**
@@ -295,19 +278,13 @@ public class SysUser implements Serializable {
 
     public SysUserTenant toSysUserTenant(String tenantId) {
         SysUserTenant userTenant = new SysUserTenant();
-        userTenant.setIcCard(this.icCard);
         userTenant.setTenantId(tenantId);
         userTenant.setId(this.getId());
         userTenant.setEnterDate(this.getEnterDate());
         userTenant.setFormalDate(this.getFormalDate());
         userTenant.setFormalStatus(this.getFormalStatus());
         userTenant.setServingState(this.getServingState());
-        userTenant.setServingPactDate(this.getServingPactDate());
-        userTenant.setServingPactDateEnd(this.getServingPactDateEnd());
         userTenant.setDeptId(this.getDeptId());
-        userTenant.setHrType(this.getHrType());
-        userTenant.setPositionId(this.getPositionId());
-        userTenant.setPositionType(this.getPositionType());
         return userTenant;
     }
 

src/main/java/com/qs/serve/modules/sys/mapper/SysUserMapper.java

@@ -32,7 +32,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param appClient
      */
     @InterceptorIgnore(tenantLine = "1")
-    @Update("update `sys_user` sys_user set ym_token = #{token}, app_client=#{appClient} where id = #{uid}")
+    @Update("update `sys_user` sys_user set app_token = #{token}, app_client=#{appClient} where id = #{uid}")
     void updateYmTokenInt(@Param("uid")String uid,@Param("token")String token,@Param("appClient")String appClient);
 
     /**
@@ -40,7 +40,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param token
      */
     @InterceptorIgnore(tenantLine = "1")
-    @Update("update `sys_user` sys_user set sys_user.ym_token = '#' where sys_user.ym_token = #{token}")
+    @Update("update `sys_user` sys_user set sys_user.app_token = '#' where sys_user.app_token = #{token}")
     void clearYmToken(@Param("token")String token);
 
     /**
@@ -51,19 +51,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @InterceptorIgnore(tenantLine = "1")
     List<SysUser> listUser(SysUser sysUser);
 
-    /**
-     * 所有政治面貌
-     * @return
-     */
-    @Select("select politics_status from sys_user where politics_status is not null group by politics_status")
-    List<String> getPoliticsStatusStrings();
-
-    /**
-     * 所有职位
-     * @return
-     */
-    @Select("select `position_id` from sys_user where `position_id` is not null group by `position_id`")
-    List<String> getPositionStrings();
-
 }
 

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -72,10 +72,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUser> listUser(SysUser sysUser) {
         List<SysUser> list = baseMapper.listUser(sysUser);
         list.forEach(usr->{
-            if(usr.getHideStatus().equals(1)){
             usr.setMobile(DesensitizedUtil.mobilePhone(usr.getMobile()));
             usr.setAccount(DesensitizedUtil.mobilePhone(usr.getMobile()));
-            }
             usr.setPassword(null);
         });
         return list;

src/main/resources/mapper/sys/SysUserMapper.xml

@@ -8,35 +8,22 @@
         <result property="account"  column="account"/>
         <result property="name"  column="name"/>
         <result property="code"  column="code"/>
-        <result property="icCard"   column="ic_card"/>
-        <result property="positionId"   column="position_id"/>
-        <result property="positionType"   column="position_type"/>
         <result property="password"  column="password"/>
         <result property="icon"  column="icon"/>
         <result property="deptId"  column="dept_id"/>
-        <result property="hrType"   column="hr_type"/>
+        <result property="positionId"  column="position_id"/>
         <result property="superFlag"  column="super_flag"/>
         <result property="loginEnable"  column="login_enable"/>
         <result property="servingState"  column="serving_state"/>
         <result property="identityNo"  column="identity_no"/>
-        <result property="socStatus"   column="soc_status"/>
-        <result property="socFirstFlag"   column="soc_first_flag"/>
-        <result property="socCardFlag"   column="soc_card_flag"/>
-        <result property="socStartDate"   column="soc_start_date"/>
-        <result property="housingState"   column="housing_state"/>
-        <result property="housingStartDate"   column="housing_start_date"/>
         <result property="enterDate"  column="enter_date"/>
-        <result property="servingPactDateEnd"   column="serving_pact_date_end"/>
-        <result property="servingPactDate"   column="serving_pact_date"/>
         <result property="formalDate"  column="formal_date"/>
         <result property="formalStatus"  column="formal_status"/>
-        <result property="hideStatus"   column="hide_status"/>
         <result property="remark"  column="remark"/>
         <result property="emerName"  column="emer_name"/>
         <result property="emerRelate"  column="emer_relate"/>
         <result property="emerMobile"  column="emer_mobile"/>
         <result property="emerWorksapce"  column="emer_worksapce"/>
-        <result property="carNum"   column="car_num"/>
         <result property="emerAddress"  column="emer_address"/>
         <result property="localType"  column="local_type"/>
         <result property="houseType"  column="house_type"/>
@@ -50,22 +37,16 @@
         <result property="gender"  column="gender"/>
         <result property="birthday"  column="birthday"/>
         <result property="eduSchool"  column="edu_school"/>
-        <result property="homeCall"   column="home_call"/>
-        <result property="orgRegistCode"   column="org_regist_code"/>
         <result property="eduLevel"  column="edu_level"/>
         <result property="eduProfession"  column="edu_profession"/>
-        <result property="ymToken"   column="ym_token"/>
+        <result property="appClient"  column="app_client"/>
+        <result property="appToken"  column="app_token"/>
         <result property="createTime"  column="create_time"/>
         <result property="createBy"  column="create_by"/>
         <result property="updateTime"  column="update_time"/>
         <result property="updateBy"  column="update_by"/>
-    </resultMap>
+        <result property="delFlag"  column="del_flag"/>
-
+        <result property="tenantId"  column="tenant_id"/>
-    <resultMap id="sysUserMap2" extends="sysUserMap" type="com.qs.serve.modules.sys.entity.SysUser">
-        <collection property="deptInfo" ofType="com.qs.serve.modules.sys.entity.SysDept"
-                    select="com.qs.serve.modules.sys.mapper.SysDeptMapper.selectById"
-                    column="deptId">
-        </collection>
     </resultMap>
 
     <sql id="sysUserSql">
@@ -76,16 +57,15 @@
         sys_user.`code`,
         sys_user.`password`,
         sys_user.`icon`,
+        sys_user.`dept_id`,
+        sys_user.`position_id`,
         sys_user.`super_flag`,
         sys_user.`login_enable`,
+        sys_user.`serving_state`,
         sys_user.`identity_no`,
-		sys_user.`soc_status`,
+        sys_user.`enter_date`,
-		sys_user.`soc_first_flag`,
+        sys_user.`formal_date`,
-		sys_user.`soc_card_flag`,
+        sys_user.`formal_status`,
-		sys_user.`soc_start_date`,
-		sys_user.`housing_state`,
-		sys_user.`housing_start_date`,
-		sys_user.`hide_status`,
         sys_user.`remark`,
         sys_user.`emer_name`,
         sys_user.`emer_relate`,
@@ -103,77 +83,65 @@
         sys_user.`married_flag`,
         sys_user.`gender`,
         sys_user.`birthday`,
-		sys_user.`car_num`,
-		sys_user.`home_call`,
-		sys_user.`org_regist_code`,
         sys_user.`edu_school`,
         sys_user.`edu_level`,
         sys_user.`edu_profession`,
-		sys_user.`ym_token`,
+        sys_user.`app_client`,
+        sys_user.`app_token`,
         sys_user.`create_time`,
         sys_user.`create_by`,
         sys_user.`update_time`,
-		sys_user.`update_by`
+        sys_user.`update_by`,
-    </sql>
+        sys_user.`del_flag`,
+        sys_user.`tenant_id`    </sql>
 
-    <select id="listUser" resultType="com.qs.serve.modules.sys.entity.SysUser" resultMap="sysUserMap2">
+    <select id="listUser" parameterType="com.qs.serve.modules.sys.entity.SysUser" resultMap="sysUserMap">
-        SELECT
+        SELECT <include refid="sysUserSql"/> FROM `sys_user` `sys_user`
-        <include refid="sysUserSql"/>,
-        `sys_post`.`name` `position_val`,
-        `sys_dept`.`code` deptcode
-        from sys_user `sys_user`
-        <if test="roleIds!=null and roleIds.size > 0">
-        left join sys_user_role sys_user_role ON sys_user_role.user_id = sys_user.id
-        </if>
-        left join `sys_post` `sys_post` ON `sys_user`.`position_id` = `sys_post`.id
-        left join `sys_dept` `sys_dept` ON `sys_user_tenant`.`dept_id` = `sys_dept`.id
         <where>
-            and `sys_user`.`del_flag` = b'0'
+            <if test="query.id != null and query.id != ''"> and `sys_user`.`id` = #{query.id}</if>
-            <if test="id != null and id != ''"> and `sys_user`.id = #{id}</if>
+            <if test="query.mobile != null and query.mobile != ''"> and `sys_user`.`mobile` = #{query.mobile}</if>
-            <if test="mobile != null and mobile != ''"> and `sys_user`.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+            <if test="query.account != null and query.account != ''"> and `sys_user`.`account` = #{query.account}</if>
-            <if test="positionId != null"> and `sys_user_tenant`.`position_id` = #{positionId}</if>
+            <if test="query.name != null and query.name != ''"> and `sys_user`.`name` = #{query.name}</if>
-            <if test="loginEnable != null"> and `sys_user`.`login_enable` = #{loginEnable}</if>
+            <if test="query.code != null and query.code != ''"> and `sys_user`.`code` = #{query.code}</if>
-            <if test="servingState != null"> and `sys_user_tenant`.`serving_state` = #{servingState}</if>
+            <if test="query.password != null and query.password != ''"> and `sys_user`.`password` = #{query.password}</if>
-            <if test="account != null and account != ''"> and `sys_user`.account = #{account}</if>
+            <if test="query.icon != null and query.icon != ''"> and `sys_user`.`icon` = #{query.icon}</if>
-            <if test="name != null and name != ''"> and `sys_user`.`name` LIKE CONCAT('%',#{name},'%')</if>
+            <if test="query.deptId != null and query.deptId != ''"> and `sys_user`.`dept_id` = #{query.deptId}</if>
-            <if test="code != null and code != ''"> and `sys_user`.code LIKE CONCAT('%',#{code},'%')</if>
+            <if test="query.positionId != null and query.positionId != ''"> and `sys_user`.`position_id` = #{query.positionId}</if>
-            <if test="password != null and password != ''"> and `sys_user`.password = #{password}</if>
+            <if test="query.superFlag != null"> and `sys_user`.`super_flag` = #{query.superFlag}</if>
-            <if test="deptId != null and deptId != ''"> and `sys_user_tenant`.dept_id = #{deptId}</if>
+            <if test="query.loginEnable != null"> and `sys_user`.`login_enable` = #{query.loginEnable}</if>
-            <if test="superFlag != null"> and `sys_user`.super_flag = #{superFlag}</if>
+            <if test="query.servingState != null"> and `sys_user`.`serving_state` = #{query.servingState}</if>
-            <if test="hrType != null"> and `sys_user_tenant`.hr_type = #{hrType}</if>
+            <if test="query.identityNo != null and query.identityNo != ''"> and `sys_user`.`identity_no` = #{query.identityNo}</if>
-            <if test="createBy != null and createBy != ''"> and `sys_user`.create_by = #{createBy}</if>
+            <if test="query.enterDate != null"> and `sys_user`.`enter_date` = #{query.enterDate}</if>
-            <if test="updateBy != null and updateBy != ''"> and `sys_user`.update_by = #{updateBy}</if>
+            <if test="query.formalDate != null"> and `sys_user`.`formal_date` = #{query.formalDate}</if>
-            <if test="tenantId != null and tenantId != ''">
+            <if test="query.formalStatus != null"> and `sys_user`.`formal_status` = #{query.formalStatus}</if>
-             and `sys_user_tenant`.tenant_id = #{tenantId}
+            <if test="query.remark != null and query.remark != ''"> and `sys_user`.`remark` = #{query.remark}</if>
-            </if>
+            <if test="query.emerName != null and query.emerName != ''"> and `sys_user`.`emer_name` = #{query.emerName}</if>
-            <if test="searchValue != null and searchValue != ''">
+            <if test="query.emerRelate != null and query.emerRelate != ''"> and `sys_user`.`emer_relate` = #{query.emerRelate}</if>
-             and ( `sys_user`.mobile LIKE CONCAT('%',#{searchValue},'%')
+            <if test="query.emerWorksapce != null and query.emerWorksapce != ''"> and `sys_user`.`emer_worksapce` = #{query.emerWorksapce}</if>
-                   or `sys_user`.account LIKE CONCAT('%',#{searchValue},'%')
+            <if test="query.emerAddress != null and query.emerAddress != ''"> and `sys_user`.`emer_address` = #{query.emerAddress}</if>
-                   or `sys_user`.`name` LIKE CONCAT('%',#{searchValue},'%')
+            <if test="query.localType != null"> and `sys_user`.`local_type` = #{query.localType}</if>
-                    or `sys_user`.code LIKE CONCAT('%',#{searchValue},'%') )
+            <if test="query.houseType != null"> and `sys_user`.`house_type` = #{query.houseType}</if>
-            </if>
+            <if test="query.nation != null and query.nation != ''"> and `sys_user`.`nation` = #{query.nation}</if>
-            <if test="multiDeptIds != null and multiDeptIds.size > 0 "> and `sys_user_tenant`.dept_id in
+            <if test="query.national != null and query.national != ''"> and `sys_user`.`national` = #{query.national}</if>
-                <foreach collection="multiDeptIds" item ="muDeptId" index="i" open="(" close=")" separator=",">
+            <if test="query.nativePlace != null and query.nativePlace != ''"> and `sys_user`.`native_place` = #{query.nativePlace}</if>
-                    #{muDeptId}
+            <if test="query.nativeAddress != null and query.nativeAddress != ''"> and `sys_user`.`native_address` = #{query.nativeAddress}</if>
-                </foreach>
+            <if test="query.currAddress != null and query.currAddress != ''"> and `sys_user`.`curr_address` = #{query.currAddress}</if>
-            </if>
+            <if test="query.politicsStatus != null and query.politicsStatus != ''"> and `sys_user`.`politics_status` = #{query.politicsStatus}</if>
-            <if test="roleIds!=null and roleIds.size > 0">
+            <if test="query.marriedFlag != null"> and `sys_user`.`married_flag` = #{query.marriedFlag}</if>
-                and sys_user_role.del_flag = b'0' and sys_user_role.role_id in
+            <if test="query.gender != null"> and `sys_user`.`gender` = #{query.gender}</if>
-                <foreach collection="roleIds" item ="roleId" index="i" open="(" close=")" separator=",">
+            <if test="query.birthday != null"> and `sys_user`.`birthday` = #{query.birthday}</if>
-                    #{roleId}
+            <if test="query.eduSchool != null and query.eduSchool != ''"> and `sys_user`.`edu_school` = #{query.eduSchool}</if>
-                </foreach>
+            <if test="query.eduLevel != null"> and `sys_user`.`edu_level` = #{query.eduLevel}</if>
-            </if>
+            <if test="query.eduProfession != null and query.eduProfession != ''"> and `sys_user`.`edu_profession` = #{query.eduProfession}</if>
-            <if test="selectIds!=null and selectIds.size > 0">
+            <if test="query.appClient != null and query.appClient != ''"> and `sys_user`.`app_client` = #{query.appClient}</if>
-                and sys_user.id in
+            <if test="query.appToken != null and query.appToken != ''"> and `sys_user`.`app_token` = #{query.appToken}</if>
-                <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
+            <if test="query.createTime != null"> and `sys_user`.`create_time` = #{query.createTime}</if>
-                    #{selectId}
+            <if test="query.createBy != null and query.createBy != ''"> and `sys_user`.`create_by` = #{query.createBy}</if>
-                </foreach>
+            <if test="query.updateTime != null"> and `sys_user`.`update_time` = #{query.updateTime}</if>
-            </if>
+            <if test="query.updateBy != null and query.updateBy != ''"> and `sys_user`.`update_by` = #{query.updateBy}</if>
-            <if test="orderByPinYin!=null and orderByPinYin=1">
+            <if test="query.delFlag != null"> and `sys_user`.`del_flag` = #{query.delFlag}</if>
-                 ORDER BY firstPinyin(`sys_user`.`name`) ,`sys_user`.`name`
+            <if test="query.tenantId != null and query.tenantId != ''"> and `sys_user`.`tenant_id` = #{query.tenantId}</if>
-            </if>
         </where>
     </select>
 
 </mapper>
-