Skip to content

E
enterprise-platform
Commit 359561ad authored by 赵啸非's avatar 赵啸非
Browse files
Options

删除部分过时类

parent 32153d88
Show whitespace changes
Inline Side-by-side
Showing with 1431 additions and 212 deletions
db/add.sql 0 → 100644
View file @ 359561ad
-- ----------------------------
2023-9-11
-- ----------------------------
ALTER TABLE mortals_xhx_user ADD COLUMN `staffId` varchar(64) COMMENT '员工Id，关联用户员工表';
ALTER TABLE mortals_xhx_user ADD COLUMN `serviceAprParams` varchar(1024) default '' COMMENT '事件服务接口请求参数';
enterprise-manager-ui/admin/src/components/Header.vue
View file @ 359561ad
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/> />
<b style="color:white;font-size:18px;" <b style="color:white;font-size:18px;"
>&nbsp;&nbsp;&nbsp; >&nbsp;&nbsp;&nbsp;
{{ sysName ? sysName : "智慧办公系统" }} {{ sysName ? sysName : "企业服务平台" }}
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b
> >
</router-link> </router-link>
......
enterprise-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @ 359561ad
...@@ -75,7 +75,29 @@ public class UserEntity extends UserVo implements IUser { ...@@ -75,7 +75,29 @@ public class UserEntity extends UserVo implements IUser {
* 最后一次登录地址 * 最后一次登录地址
*/ */
private String lastLoginAddress; private String lastLoginAddress;
/**
* 员工Id，关联用户员工表
*/
private Long staffId;
/**
* 微信openId
*/
private String openId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 客户ID
*/
private Long customerId;
/**
* 用户所属部门id
*/
private Long deptId;
public UserEntity(){} public UserEntity(){}
...@@ -340,7 +362,33 @@ public class UserEntity extends UserVo implements IUser { ...@@ -340,7 +362,33 @@ public class UserEntity extends UserVo implements IUser {
} }
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
public Long getStaffId() {
return staffId;
}
public void setStaffId(Long staffId) {
this.staffId = staffId;
}
public String getOpenId() {
return openId;
}
public void setOpenId(String openId) {
this.openId = openId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
@Override @Override
public int hashCode() { public int hashCode() {
......
enterprise-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserQuery.java
View file @ 359561ad
package com.mortals.xhx.base.system.user.model; package com.mortals.xhx.base.system.user.model;
import com.mortals.xhx.base.system.user.model.UserEntity;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -7,7 +8,7 @@ import java.util.List; ...@@ -7,7 +8,7 @@ import java.util.List;
* 用户信息业务查询对象 * 用户信息业务查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-06 * @date 2023-09-12
*/ */
public class UserQuery extends UserEntity { public class UserQuery extends UserEntity {
/** 开始 用户ID，主键，自增长 */ /** 开始 用户ID，主键，自增长 */
...@@ -22,60 +23,94 @@ public class UserQuery extends UserEntity { ...@@ -22,60 +23,94 @@ public class UserQuery extends UserEntity {
/** 用户ID，主键，自增长列表 */ /** 用户ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 用户ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 登录名 */ /** 登录名 */
private List<String> loginNameList; private List<String> loginNameList;
/** 登录名排除列表 */
private List <String> loginNameNotList;
/** 登录密码，使用md5双次加密 */ /** 登录密码，使用md5双次加密 */
private List<String> loginPwdList; private List<String> loginPwdList;
/** 登录密码，使用md5双次加密排除列表 */
private List <String> loginPwdNotList;
/** 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录 */ /** 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录 */
private List<String> loginLimitAddressList; private List<String> loginLimitAddressList;
/** 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录排除列表 */
private List <String> loginLimitAddressNotList;
/** 用户名 */ /** 用户名 */
private List<String> realNameList; private List<String> realNameList;
/** 用户名排除列表 */
private List <String> realNameNotList;
/** 用户手机号 */ /** 用户手机号 */
private List<String> mobileList; private List<String> mobileList;
/** 用户手机号排除列表 */
private List <String> mobileNotList;
/** 用户联系电话 */ /** 用户联系电话 */
private List<String> phoneList; private List<String> phoneList;
/** 用户联系电话排除列表 */
private List <String> phoneNotList;
/** 用户邮箱 */ /** 用户邮箱 */
private List<String> emailList; private List<String> emailList;
/** 用户邮箱排除列表 */
private List <String> emailNotList;
/** QQ号码 */ /** QQ号码 */
private List<String> qqList; private List<String> qqList;
/** 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) */ /** QQ号码排除列表 */
private List <String> qqNotList;
/** 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 */
private Integer userTypeStart; private Integer userTypeStart;
/** 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) */ /** 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 */
private Integer userTypeEnd; private Integer userTypeEnd;
/** 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) */ /** 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2 */
private Integer userTypeIncrement; private Integer userTypeIncrement;
/** 用户类型(0.系统用户,1.普通用户,2.工作人员)列表 */ /** 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2列表 */
private List <Integer> userTypeList; private List <Integer> userTypeList;
/** 所属站点id,多个逗号分隔 */ /** 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2排除列表 */
private List<String> siteIdsList; private List <Integer> userTypeNotList;
/** 所属区域code,多个逗号分隔 */
private List<String> areaCodesList;
/** 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */ /** 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */
private Integer statusStart; private Integer statusStart;
/** 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */ /** 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */
private Integer statusEnd; private Integer statusEnd;
/** 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */ /** 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1 */
private Integer statusIncrement; private Integer statusIncrement;
/** 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)列表 */ /** 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1排除列表 */
private List <Integer> statusNotList;
/** 开始 客户ID */
private Long customerIdStart;
/** 结束 客户ID */
private Long customerIdEnd;
/** 增加 客户ID */
private Long customerIdIncrement;
/** 客户ID列表 */
private List <Long> customerIdList;
/** 客户ID排除列表 */
private List <Long> customerIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -94,9 +129,14 @@ public class UserQuery extends UserEntity { ...@@ -94,9 +129,14 @@ public class UserQuery extends UserEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 创建用户名称 */ /** 创建用户名称 */
private List<String> createUserNameList; private List<String> createUserNameList;
/** 创建用户名称排除列表 */
private List <String> createUserNameNotList;
/** 开始 最后一次登录时间 */ /** 开始 最后一次登录时间 */
private String lastLoginTimeStart; private String lastLoginTimeStart;
...@@ -106,6 +146,48 @@ public class UserQuery extends UserEntity { ...@@ -106,6 +146,48 @@ public class UserQuery extends UserEntity {
/** 最后一次登录地址 */ /** 最后一次登录地址 */
private List<String> lastLoginAddressList; private List<String> lastLoginAddressList;
/** 最后一次登录地址排除列表 */
private List <String> lastLoginAddressNotList;
/** 开始 用户所属部门id */
private Long deptIdStart;
/** 结束 用户所属部门id */
private Long deptIdEnd;
/** 增加 用户所属部门id */
private Long deptIdIncrement;
/** 用户所属部门id列表 */
private List <Long> deptIdList;
/** 用户所属部门id排除列表 */
private List <Long> deptIdNotList;
/** 所属部门名称 */
private List<String> deptNameList;
/** 所属部门名称排除列表 */
private List <String> deptNameNotList;
/** 所属站点id,多个逗号分隔 */
private List<String> siteIdsList;
/** 所属站点id,多个逗号分隔排除列表 */
private List <String> siteIdsNotList;
/** 所属区域code,多个逗号分隔 */
private List<String> areaCodesList;
/** 所属区域code,多个逗号分隔排除列表 */
private List <String> areaCodesNotList;
/** 员工Id，关联用户员工表 */
private List<Long> staffIdList;
/** 员工Id，关联用户员工表排除列表 */
private List <Long> staffIdNotList;
/** 微信openId */
private List<String> openIdList;
/** 微信openId排除列表 */
private List <String> openIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<UserQuery> orConditionList; private List<UserQuery> orConditionList;
...@@ -178,6 +260,23 @@ public class UserQuery extends UserEntity { ...@@ -178,6 +260,23 @@ public class UserQuery extends UserEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 用户ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 用户ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 登录名 * 获取 登录名
* @return loginNameList * @return loginNameList
...@@ -193,6 +292,23 @@ public class UserQuery extends UserEntity { ...@@ -193,6 +292,23 @@ public class UserQuery extends UserEntity {
public void setLoginNameList(List<String> loginNameList){ public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList; this.loginNameList = loginNameList;
} }
/**
* 获取 登录名
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 登录名
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/** /**
* 获取 登录密码，使用md5双次加密 * 获取 登录密码，使用md5双次加密
* @return loginPwdList * @return loginPwdList
...@@ -208,6 +324,23 @@ public class UserQuery extends UserEntity { ...@@ -208,6 +324,23 @@ public class UserQuery extends UserEntity {
public void setLoginPwdList(List<String> loginPwdList){ public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList; this.loginPwdList = loginPwdList;
} }
/**
* 获取 登录密码，使用md5双次加密
* @return loginPwdNotList
*/
public List<String> getLoginPwdNotList(){
return this.loginPwdNotList;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdNotList
*/
public void setLoginPwdNotList(List<String> loginPwdNotList){
this.loginPwdNotList = loginPwdNotList;
}
/** /**
* 获取 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录 * 获取 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @return loginLimitAddressList * @return loginLimitAddressList
...@@ -223,6 +356,23 @@ public class UserQuery extends UserEntity { ...@@ -223,6 +356,23 @@ public class UserQuery extends UserEntity {
public void setLoginLimitAddressList(List<String> loginLimitAddressList){ public void setLoginLimitAddressList(List<String> loginLimitAddressList){
this.loginLimitAddressList = loginLimitAddressList; this.loginLimitAddressList = loginLimitAddressList;
} }
/**
* 获取 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @return loginLimitAddressNotList
*/
public List<String> getLoginLimitAddressNotList(){
return this.loginLimitAddressNotList;
}
/**
* 设置 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @param loginLimitAddressNotList
*/
public void setLoginLimitAddressNotList(List<String> loginLimitAddressNotList){
this.loginLimitAddressNotList = loginLimitAddressNotList;
}
/** /**
* 获取 用户名 * 获取 用户名
* @return realNameList * @return realNameList
...@@ -238,6 +388,23 @@ public class UserQuery extends UserEntity { ...@@ -238,6 +388,23 @@ public class UserQuery extends UserEntity {
public void setRealNameList(List<String> realNameList){ public void setRealNameList(List<String> realNameList){
this.realNameList = realNameList; this.realNameList = realNameList;
} }
/**
* 获取 用户名
* @return realNameNotList
*/
public List<String> getRealNameNotList(){
return this.realNameNotList;
}
/**
* 设置 用户名
* @param realNameNotList
*/
public void setRealNameNotList(List<String> realNameNotList){
this.realNameNotList = realNameNotList;
}
/** /**
* 获取 用户手机号 * 获取 用户手机号
* @return mobileList * @return mobileList
...@@ -253,6 +420,23 @@ public class UserQuery extends UserEntity { ...@@ -253,6 +420,23 @@ public class UserQuery extends UserEntity {
public void setMobileList(List<String> mobileList){ public void setMobileList(List<String> mobileList){
this.mobileList = mobileList; this.mobileList = mobileList;
} }
/**
* 获取 用户手机号
* @return mobileNotList
*/
public List<String> getMobileNotList(){
return this.mobileNotList;
}
/**
* 设置 用户手机号
* @param mobileNotList
*/
public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList;
}
/** /**
* 获取 用户联系电话 * 获取 用户联系电话
* @return phoneList * @return phoneList
...@@ -268,6 +452,23 @@ public class UserQuery extends UserEntity { ...@@ -268,6 +452,23 @@ public class UserQuery extends UserEntity {
public void setPhoneList(List<String> phoneList){ public void setPhoneList(List<String> phoneList){
this.phoneList = phoneList; this.phoneList = phoneList;
} }
/**
* 获取 用户联系电话
* @return phoneNotList
*/
public List<String> getPhoneNotList(){
return this.phoneNotList;
}
/**
* 设置 用户联系电话
* @param phoneNotList
*/
public void setPhoneNotList(List<String> phoneNotList){
this.phoneNotList = phoneNotList;
}
/** /**
* 获取 用户邮箱 * 获取 用户邮箱
* @return emailList * @return emailList
...@@ -283,6 +484,23 @@ public class UserQuery extends UserEntity { ...@@ -283,6 +484,23 @@ public class UserQuery extends UserEntity {
public void setEmailList(List<String> emailList){ public void setEmailList(List<String> emailList){
this.emailList = emailList; this.emailList = emailList;
} }
/**
* 获取 用户邮箱
* @return emailNotList
*/
public List<String> getEmailNotList(){
return this.emailNotList;
}
/**
* 设置 用户邮箱
* @param emailNotList
*/
public void setEmailNotList(List<String> emailNotList){
this.emailNotList = emailNotList;
}
/** /**
* 获取 QQ号码 * 获取 QQ号码
* @return qqList * @return qqList
...@@ -298,8 +516,25 @@ public class UserQuery extends UserEntity { ...@@ -298,8 +516,25 @@ public class UserQuery extends UserEntity {
public void setQqList(List<String> qqList){ public void setQqList(List<String> qqList){
this.qqList = qqList; this.qqList = qqList;
} }
/**
* 获取 QQ号码
* @return qqNotList
*/
public List<String> getQqNotList(){
return this.qqNotList;
}
/**
* 设置 QQ号码
* @param qqNotList
*/
public void setQqNotList(List<String> qqNotList){
this.qqNotList = qqNotList;
}
/** /**
* 获取 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) * 获取 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @return userTypeStart * @return userTypeStart
*/ */
public Integer getUserTypeStart(){ public Integer getUserTypeStart(){
...@@ -307,7 +542,7 @@ public class UserQuery extends UserEntity { ...@@ -307,7 +542,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeStart * @param userTypeStart
*/ */
public void setUserTypeStart(Integer userTypeStart){ public void setUserTypeStart(Integer userTypeStart){
...@@ -315,7 +550,7 @@ public class UserQuery extends UserEntity { ...@@ -315,7 +550,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) * 获取 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @return $userTypeEnd * @return $userTypeEnd
*/ */
public Integer getUserTypeEnd(){ public Integer getUserTypeEnd(){
...@@ -323,7 +558,7 @@ public class UserQuery extends UserEntity { ...@@ -323,7 +558,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeEnd * @param userTypeEnd
*/ */
public void setUserTypeEnd(Integer userTypeEnd){ public void setUserTypeEnd(Integer userTypeEnd){
...@@ -331,7 +566,7 @@ public class UserQuery extends UserEntity { ...@@ -331,7 +566,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) * 获取 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @return userTypeIncrement * @return userTypeIncrement
*/ */
public Integer getUserTypeIncrement(){ public Integer getUserTypeIncrement(){
...@@ -339,7 +574,7 @@ public class UserQuery extends UserEntity { ...@@ -339,7 +574,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeIncrement * @param userTypeIncrement
*/ */
public void setUserTypeIncrement(Integer userTypeIncrement){ public void setUserTypeIncrement(Integer userTypeIncrement){
...@@ -347,7 +582,7 @@ public class UserQuery extends UserEntity { ...@@ -347,7 +582,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员) * 获取 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @return userTypeList * @return userTypeList
*/ */
public List<Integer> getUserTypeList(){ public List<Integer> getUserTypeList(){
...@@ -355,7 +590,7 @@ public class UserQuery extends UserEntity { ...@@ -355,7 +590,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeList * @param userTypeList
*/ */
public void setUserTypeList(List<Integer> userTypeList){ public void setUserTypeList(List<Integer> userTypeList){
...@@ -363,37 +598,24 @@ public class UserQuery extends UserEntity { ...@@ -363,37 +598,24 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 所属站点id,多个逗号分隔 * 获取 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @return siteIdsList * @return userTypeNotList
*/ */
public List<String> getSiteIdsList(){ public List<Integer> getUserTypeNotList(){
return this.siteIdsList; return this.userTypeNotList;
} }
/** /**
* 设置 所属站点id,多个逗号分隔 * 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param siteIdsList * @param userTypeNotList
*/
public void setSiteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
}
/**
* 获取 所属区域code,多个逗号分隔
* @return areaCodesList
*/ */
public List<String> getAreaCodesList(){ public void setUserTypeNotList(List<Integer> userTypeNotList){
return this.areaCodesList; this.userTypeNotList = userTypeNotList;
} }
/** /**
* 设置 所属区域code,多个逗号分隔 * 获取 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param areaCodesList
*/
public void setAreaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
}
/**
* 获取 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusStart * @return statusStart
*/ */
public Integer getStatusStart(){ public Integer getStatusStart(){
...@@ -401,7 +623,7 @@ public class UserQuery extends UserEntity { ...@@ -401,7 +623,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param statusStart * @param statusStart
*/ */
public void setStatusStart(Integer statusStart){ public void setStatusStart(Integer statusStart){
...@@ -409,7 +631,7 @@ public class UserQuery extends UserEntity { ...@@ -409,7 +631,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 获取 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @return $statusEnd * @return $statusEnd
*/ */
public Integer getStatusEnd(){ public Integer getStatusEnd(){
...@@ -417,7 +639,7 @@ public class UserQuery extends UserEntity { ...@@ -417,7 +639,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param statusEnd * @param statusEnd
*/ */
public void setStatusEnd(Integer statusEnd){ public void setStatusEnd(Integer statusEnd){
...@@ -425,7 +647,7 @@ public class UserQuery extends UserEntity { ...@@ -425,7 +647,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 获取 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @return statusIncrement * @return statusIncrement
*/ */
public Integer getStatusIncrement(){ public Integer getStatusIncrement(){
...@@ -433,7 +655,7 @@ public class UserQuery extends UserEntity { ...@@ -433,7 +655,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param statusIncrement * @param statusIncrement
*/ */
public void setStatusIncrement(Integer statusIncrement){ public void setStatusIncrement(Integer statusIncrement){
...@@ -441,7 +663,7 @@ public class UserQuery extends UserEntity { ...@@ -441,7 +663,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 获取 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 获取 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @return statusList * @return statusList
*/ */
public List<Integer> getStatusList(){ public List<Integer> getStatusList(){
...@@ -449,13 +671,111 @@ public class UserQuery extends UserEntity { ...@@ -449,13 +671,111 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param statusList * @param statusList
*/ */
public void setStatusList(List<Integer> statusList){ public void setStatusList(List<Integer> statusList){
this.statusList = statusList; this.statusList = statusList;
} }
/**
* 获取 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/**
* 获取 开始 客户ID
* @return customerIdStart
*/
public Long getCustomerIdStart(){
return this.customerIdStart;
}
/**
* 设置 开始 客户ID
* @param customerIdStart
*/
public void setCustomerIdStart(Long customerIdStart){
this.customerIdStart = customerIdStart;
}
/**
* 获取 结束 客户ID
* @return $customerIdEnd
*/
public Long getCustomerIdEnd(){
return this.customerIdEnd;
}
/**
* 设置 结束 客户ID
* @param customerIdEnd
*/
public void setCustomerIdEnd(Long customerIdEnd){
this.customerIdEnd = customerIdEnd;
}
/**
* 获取 增加 客户ID
* @return customerIdIncrement
*/
public Long getCustomerIdIncrement(){
return this.customerIdIncrement;
}
/**
* 设置 增加 客户ID
* @param customerIdIncrement
*/
public void setCustomerIdIncrement(Long customerIdIncrement){
this.customerIdIncrement = customerIdIncrement;
}
/**
* 获取 客户ID
* @return customerIdList
*/
public List<Long> getCustomerIdList(){
return this.customerIdList;
}
/**
* 设置 客户ID
* @param customerIdList
*/
public void setCustomerIdList(List<Long> customerIdList){
this.customerIdList = customerIdList;
}
/**
* 获取 客户ID
* @return customerIdNotList
*/
public List<Long> getCustomerIdNotList(){
return this.customerIdNotList;
}
/**
* 设置 客户ID
* @param customerIdNotList
*/
public void setCustomerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -552,6 +872,23 @@ public class UserQuery extends UserEntity { ...@@ -552,6 +872,23 @@ public class UserQuery extends UserEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 创建用户名称 * 获取 创建用户名称
* @return createUserNameList * @return createUserNameList
...@@ -567,6 +904,23 @@ public class UserQuery extends UserEntity { ...@@ -567,6 +904,23 @@ public class UserQuery extends UserEntity {
public void setCreateUserNameList(List<String> createUserNameList){ public void setCreateUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList; this.createUserNameList = createUserNameList;
} }
/**
* 获取 创建用户名称
* @return createUserNameNotList
*/
public List<String> getCreateUserNameNotList(){
return this.createUserNameNotList;
}
/**
* 设置 创建用户名称
* @param createUserNameNotList
*/
public void setCreateUserNameNotList(List<String> createUserNameNotList){
this.createUserNameNotList = createUserNameNotList;
}
/** /**
* 获取 开始 最后一次登录时间 * 获取 开始 最后一次登录时间
* @return lastLoginTimeStart * @return lastLoginTimeStart
...@@ -614,63 +968,330 @@ public class UserQuery extends UserEntity { ...@@ -614,63 +968,330 @@ public class UserQuery extends UserEntity {
public void setLastLoginAddressList(List<String> lastLoginAddressList){ public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList; this.lastLoginAddressList = lastLoginAddressList;
} }
/** /**
* 设置 用户ID，主键，自增长 * 获取 最后一次登录地址
* @param id * @return lastLoginAddressNotList
*/ */
public UserQuery id(Long id){ public List<String> getLastLoginAddressNotList(){
setId(id); return this.lastLoginAddressNotList;
return this;
} }
/** /**
* 设置 开始 用户ID，主键，自增长 * 设置 最后一次登录地址
* @param idStart * @param lastLoginAddressNotList
*/ */
public UserQuery idStart(Long idStart){ public void setLastLoginAddressNotList(List<String> lastLoginAddressNotList){
this.idStart = idStart; this.lastLoginAddressNotList = lastLoginAddressNotList;
return this;
} }
/** /**
* 设置 结束 用户ID，主键，自增长 * 获取 开始 用户所属部门id
* @param idEnd * @return deptIdStart
*/ */
public UserQuery idEnd(Long idEnd){ public Long getDeptIdStart(){
this.idEnd = idEnd; return this.deptIdStart;
return this;
} }
/** /**
* 设置 增加 用户ID，主键，自增长 * 设置 开始 用户所属部门id
* @param idIncrement * @param deptIdStart
*/ */
public UserQuery idIncrement(Long idIncrement){ public void setDeptIdStart(Long deptIdStart){
this.idIncrement = idIncrement; this.deptIdStart = deptIdStart;
return this;
} }
/** /**
* 设置 用户ID，主键，自增长 * 获取 结束 用户所属部门id
* @param idList * @return $deptIdEnd
*/ */
public UserQuery idList(List<Long> idList){ public Long getDeptIdEnd(){
this.idList = idList; return this.deptIdEnd;
return this;
} }
/** /**
* 设置 登录名 * 设置 结束 用户所属部门id
* @param loginName * @param deptIdEnd
*/ */
public UserQuery loginName(String loginName){ public void setDeptIdEnd(Long deptIdEnd){
setLoginName(loginName); this.deptIdEnd = deptIdEnd;
return this;
} }
/** /**
* 设置 登录名 * 获取 增加 用户所属部门id
* @return deptIdIncrement
*/
public Long getDeptIdIncrement(){
return this.deptIdIncrement;
}
/**
* 设置 增加 用户所属部门id
* @param deptIdIncrement
*/
public void setDeptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement;
}
/**
* 获取 用户所属部门id
* @return deptIdList
*/
public List<Long> getDeptIdList(){
return this.deptIdList;
}
/**
* 设置 用户所属部门id
* @param deptIdList
*/
public void setDeptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList;
}
/**
* 获取 用户所属部门id
* @return deptIdNotList
*/
public List<Long> getDeptIdNotList(){
return this.deptIdNotList;
}
/**
* 设置 用户所属部门id
* @param deptIdNotList
*/
public void setDeptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
}
/**
* 获取 所属部门名称
* @return deptNameList
*/
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 所属部门名称
* @param deptNameList
*/
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 所属部门名称
* @return deptNameNotList
*/
public List<String> getDeptNameNotList(){
return this.deptNameNotList;
}
/**
* 设置 所属部门名称
* @param deptNameNotList
*/
public void setDeptNameNotList(List<String> deptNameNotList){
this.deptNameNotList = deptNameNotList;
}
/**
* 获取 所属站点id,多个逗号分隔
* @return siteIdsList
*/
public List<String> getSiteIdsList(){
return this.siteIdsList;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIdsList
*/
public void setSiteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
}
/**
* 获取 所属站点id,多个逗号分隔
* @return siteIdsNotList
*/
public List<String> getSiteIdsNotList(){
return this.siteIdsNotList;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIdsNotList
*/
public void setSiteIdsNotList(List<String> siteIdsNotList){
this.siteIdsNotList = siteIdsNotList;
}
/**
* 获取 所属区域code,多个逗号分隔
* @return areaCodesList
*/
public List<String> getAreaCodesList(){
return this.areaCodesList;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesList
*/
public void setAreaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
}
/**
* 获取 所属区域code,多个逗号分隔
* @return areaCodesNotList
*/
public List<String> getAreaCodesNotList(){
return this.areaCodesNotList;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesNotList
*/
public void setAreaCodesNotList(List<String> areaCodesNotList){
this.areaCodesNotList = areaCodesNotList;
}
/**
* 获取 员工Id，关联用户员工表
* @return staffIdList
*/
public List<Long> getStaffIdList(){
return this.staffIdList;
}
/**
* 设置 员工Id，关联用户员工表
* @param staffIdList
*/
public void setStaffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
}
/**
* 获取 员工Id，关联用户员工表
* @return staffIdNotList
*/
public List<Long> getStaffIdNotList(){
return this.staffIdNotList;
}
/**
* 设置 员工Id，关联用户员工表
* @param staffIdNotList
*/
public void setStaffIdNotList(List<Long> staffIdNotList){
this.staffIdNotList = staffIdNotList;
}
/**
* 获取 微信openId
* @return openIdList
*/
public List<String> getOpenIdList(){
return this.openIdList;
}
/**
* 设置 微信openId
* @param openIdList
*/
public void setOpenIdList(List<String> openIdList){
this.openIdList = openIdList;
}
/**
* 获取 微信openId
* @return openIdNotList
*/
public List<String> getOpenIdNotList(){
return this.openIdNotList;
}
/**
* 设置 微信openId
* @param openIdNotList
*/
public void setOpenIdNotList(List<String> openIdNotList){
this.openIdNotList = openIdNotList;
}
/**
* 设置 用户ID，主键，自增长
* @param id
*/
public UserQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param idStart
*/
public UserQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param idEnd
*/
public UserQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param idIncrement
*/
public UserQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param idList
*/
public UserQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param idNotList
*/
public UserQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 登录名
* @param loginName
*/
public UserQuery loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 登录名
* @param loginNameList * @param loginNameList
*/ */
public UserQuery loginNameList(List<String> loginNameList){ public UserQuery loginNameList(List<String> loginNameList){
...@@ -812,7 +1433,7 @@ public class UserQuery extends UserEntity { ...@@ -812,7 +1433,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userType * @param userType
*/ */
public UserQuery userType(Integer userType){ public UserQuery userType(Integer userType){
...@@ -821,7 +1442,7 @@ public class UserQuery extends UserEntity { ...@@ -821,7 +1442,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 开始 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeStart * @param userTypeStart
*/ */
public UserQuery userTypeStart(Integer userTypeStart){ public UserQuery userTypeStart(Integer userTypeStart){
...@@ -830,7 +1451,7 @@ public class UserQuery extends UserEntity { ...@@ -830,7 +1451,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 结束 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeEnd * @param userTypeEnd
*/ */
public UserQuery userTypeEnd(Integer userTypeEnd){ public UserQuery userTypeEnd(Integer userTypeEnd){
...@@ -839,7 +1460,7 @@ public class UserQuery extends UserEntity { ...@@ -839,7 +1460,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 增加 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeIncrement * @param userTypeIncrement
*/ */
public UserQuery userTypeIncrement(Integer userTypeIncrement){ public UserQuery userTypeIncrement(Integer userTypeIncrement){
...@@ -848,7 +1469,7 @@ public class UserQuery extends UserEntity { ...@@ -848,7 +1469,7 @@ public class UserQuery extends UserEntity {
} }
/** /**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员) * 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeList * @param userTypeList
*/ */
public UserQuery userTypeList(List<Integer> userTypeList){ public UserQuery userTypeList(List<Integer> userTypeList){
...@@ -856,86 +1477,120 @@ public class UserQuery extends UserEntity { ...@@ -856,86 +1477,120 @@ public class UserQuery extends UserEntity {
return this; return this;
} }
/**
* 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* @param userTypeNotList
*/
public UserQuery userTypeNotList(List<Integer> userTypeNotList){
this.userTypeNotList = userTypeNotList;
return this;
}
/** /**
* 设置 所属站点id,多个逗号分隔 * 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param siteIds * @param status
*/ */
public UserQuery siteIds(String siteIds){ public UserQuery status(Integer status){
setSiteIds(siteIds); setStatus(status);
return this; return this;
} }
/** /**
* 设置 所属站点id,多个逗号分隔 * 设置 开始 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param siteIdsList * @param statusStart
*/ */
public UserQuery siteIdsList(List<String> siteIdsList){ public UserQuery statusStart(Integer statusStart){
this.siteIdsList = siteIdsList; this.statusStart = statusStart;
return this; return this;
} }
/**
* 设置 结束 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param statusEnd
*/
public UserQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/** /**
* 设置 所属区域code,多个逗号分隔 * 设置 增加 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param areaCodes * @param statusIncrement
*/ */
public UserQuery areaCodes(String areaCodes){ public UserQuery statusIncrement(Integer statusIncrement){
setAreaCodes(areaCodes); this.statusIncrement = statusIncrement;
return this; return this;
} }
/** /**
* 设置 所属区域code,多个逗号分隔 * 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param areaCodesList * @param statusList
*/ */
public UserQuery areaCodesList(List<String> areaCodesList){ public UserQuery statusList(List<Integer> statusList){
this.areaCodesList = areaCodesList; this.statusList = statusList;
return this; return this;
} }
/** /**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* @param status * @param statusNotList
*/ */
public UserQuery status(Integer status){ public UserQuery statusNotList(List<Integer> statusNotList){
setStatus(status); this.statusNotList = statusNotList;
return this; return this;
} }
/** /**
* 设置 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 客户ID
* @param statusStart * @param customerId
*/ */
public UserQuery statusStart(Integer statusStart){ public UserQuery customerId(Long customerId){
this.statusStart = statusStart; setCustomerId(customerId);
return this; return this;
} }
/** /**
* 设置 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 开始 客户ID
* @param statusEnd * @param customerIdStart
*/ */
public UserQuery statusEnd(Integer statusEnd){ public UserQuery customerIdStart(Long customerIdStart){
this.statusEnd = statusEnd; this.customerIdStart = customerIdStart;
return this; return this;
} }
/** /**
* 设置 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 结束 客户ID
* @param statusIncrement * @param customerIdEnd
*/ */
public UserQuery statusIncrement(Integer statusIncrement){ public UserQuery customerIdEnd(Long customerIdEnd){
this.statusIncrement = statusIncrement; this.customerIdEnd = customerIdEnd;
return this; return this;
} }
/** /**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) * 设置 增加 客户ID
* @param statusList * @param customerIdIncrement
*/ */
public UserQuery statusList(List<Integer> statusList){ public UserQuery customerIdIncrement(Long customerIdIncrement){
this.statusList = statusList; this.customerIdIncrement = customerIdIncrement;
return this;
}
/**
* 设置 客户ID
* @param customerIdList
*/
public UserQuery customerIdList(List<Long> customerIdList){
this.customerIdList = customerIdList;
return this;
}
/**
* 设置 客户ID
* @param customerIdNotList
*/
public UserQuery customerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
return this; return this;
} }
...@@ -985,6 +1640,15 @@ public class UserQuery extends UserEntity { ...@@ -985,6 +1640,15 @@ public class UserQuery extends UserEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public UserQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
...@@ -1024,6 +1688,155 @@ public class UserQuery extends UserEntity { ...@@ -1024,6 +1688,155 @@ public class UserQuery extends UserEntity {
return this; return this;
} }
/**
* 设置 用户所属部门id
* @param deptId
*/
public UserQuery deptId(Long deptId){
setDeptId(deptId);
return this;
}
/**
* 设置 开始 用户所属部门id
* @param deptIdStart
*/
public UserQuery deptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart;
return this;
}
/**
* 设置 结束 用户所属部门id
* @param deptIdEnd
*/
public UserQuery deptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd;
return this;
}
/**
* 设置 增加 用户所属部门id
* @param deptIdIncrement
*/
public UserQuery deptIdIncrement(Long deptIdIncrement){
this.deptIdIncrement = deptIdIncrement;
return this;
}
/**
* 设置 用户所属部门id
* @param deptIdList
*/
public UserQuery deptIdList(List<Long> deptIdList){
this.deptIdList = deptIdList;
return this;
}
/**
* 设置 用户所属部门id
* @param deptIdNotList
*/
public UserQuery deptIdNotList(List<Long> deptIdNotList){
this.deptIdNotList = deptIdNotList;
return this;
}
/**
* 设置 所属部门名称
* @param deptName
*/
public UserQuery deptName(String deptName){
setDeptName(deptName);
return this;
}
/**
* 设置 所属部门名称
* @param deptNameList
*/
public UserQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
return this;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIds
*/
public UserQuery siteIds(String siteIds){
setSiteIds(siteIds);
return this;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIdsList
*/
public UserQuery siteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
return this;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodes
*/
public UserQuery areaCodes(String areaCodes){
setAreaCodes(areaCodes);
return this;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesList
*/
public UserQuery areaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
return this;
}
/**
* 设置 员工Id，关联用户员工表
* @param staffId
*/
public UserQuery staffId(Long staffId){
setStaffId(staffId);
return this;
}
/**
* 设置 员工Id，关联用户员工表
* @param staffIdList
*/
public UserQuery staffIdList(List<Long> staffIdList){
this.staffIdList = staffIdList;
return this;
}
/**
* 设置 微信openId
* @param openId
*/
public UserQuery openId(String openId){
setOpenId(openId);
return this;
}
/**
* 设置 微信openId
* @param openIdList
*/
public UserQuery openIdList(List<String> openIdList){
this.openIdList = openIdList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
enterprise-manager/src/main/resources/sqlmap/base/system/user.xml
View file @ 359561ad
...@@ -15,14 +15,19 @@ ...@@ -15,14 +15,19 @@
<result property="email" column="email" /> <result property="email" column="email" />
<result property="qq" column="qq" /> <result property="qq" column="qq" />
<result property="userType" column="userType" /> <result property="userType" column="userType" />
<result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="customerId" column="customerId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" /> <result property="createUserName" column="createUserName" />
<result property="lastLoginTime" column="lastLoginTime" /> <result property="lastLoginTime" column="lastLoginTime" />
<result property="lastLoginAddress" column="lastLoginAddress" /> <result property="lastLoginAddress" column="lastLoginAddress" />
<result property="deptId" column="deptId" />
<result property="deptName" column="deptName" />
<result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" />
<result property="staffId" column="staffId" />
<result property="openId" column="openId" />
</resultMap> </resultMap>
...@@ -60,15 +65,12 @@ ...@@ -60,15 +65,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userType') or colPickMode == 1 and data.containsKey('userType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userType') or colPickMode == 1 and data.containsKey('userType')))">
a.userType, a.userType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIds') or colPickMode == 1 and data.containsKey('siteIds')))">
a.siteIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCodes') or colPickMode == 1 and data.containsKey('areaCodes')))">
a.areaCodes,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status, a.status,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('customerId') or colPickMode == 1 and data.containsKey('customerId')))">
a.customerId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -84,23 +86,41 @@ ...@@ -84,23 +86,41 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))">
a.lastLoginAddress, a.lastLoginAddress,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIds') or colPickMode == 1 and data.containsKey('siteIds')))">
a.siteIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCodes') or colPickMode == 1 and data.containsKey('areaCodes')))">
a.areaCodes,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
a.staffId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))">
a.openId,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,deptId,deptName,siteIds,areaCodes,staffId,openId)
VALUES VALUES
(#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress}) (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress},#{deptId},#{deptName},#{siteIds},#{areaCodes},#{staffId},#{openId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress) (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,userType,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,deptId,deptName,siteIds,areaCodes,staffId,openId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress}) (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress},#{item.deptId},#{item.deptName},#{item.siteIds},#{item.areaCodes},#{item.staffId},#{item.openId})
</foreach> </foreach>
</insert> </insert>
...@@ -140,18 +160,18 @@ ...@@ -140,18 +160,18 @@
<if test="(colPickMode==0 and data.containsKey('userTypeIncrement')) or (colPickMode==1 and !data.containsKey('userTypeIncrement'))"> <if test="(colPickMode==0 and data.containsKey('userTypeIncrement')) or (colPickMode==1 and !data.containsKey('userTypeIncrement'))">
a.userType=ifnull(a.userType,0) + #{data.userTypeIncrement}, a.userType=ifnull(a.userType,0) + #{data.userTypeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('siteIds')) or (colPickMode==1 and !data.containsKey('siteIds'))">
a.siteIds=#{data.siteIds},
</if>
<if test="(colPickMode==0 and data.containsKey('areaCodes')) or (colPickMode==1 and !data.containsKey('areaCodes'))">
a.areaCodes=#{data.areaCodes},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))"> <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status}, a.status=#{data.status},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('customerId')) or (colPickMode==1 and !data.containsKey('customerId'))">
a.customerId=#{data.customerId},
</if>
<if test="(colPickMode==0 and data.containsKey('customerIdIncrement')) or (colPickMode==1 and !data.containsKey('customerIdIncrement'))">
a.customerId=ifnull(a.customerId,0) + #{data.customerIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -170,6 +190,30 @@ ...@@ -170,6 +190,30 @@
<if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))"> <if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))">
a.lastLoginAddress=#{data.lastLoginAddress}, a.lastLoginAddress=#{data.lastLoginAddress},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
a.deptId=#{data.deptId},
</if>
<if test="(colPickMode==0 and data.containsKey('deptIdIncrement')) or (colPickMode==1 and !data.containsKey('deptIdIncrement'))">
a.deptId=ifnull(a.deptId,0) + #{data.deptIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIds')) or (colPickMode==1 and !data.containsKey('siteIds'))">
a.siteIds=#{data.siteIds},
</if>
<if test="(colPickMode==0 and data.containsKey('areaCodes')) or (colPickMode==1 and !data.containsKey('areaCodes'))">
a.areaCodes=#{data.areaCodes},
</if>
<if test="(colPickMode==0 and data.containsKey('staffId')) or (colPickMode==1 and !data.containsKey('staffId'))">
a.staffId=#{data.staffId},
</if>
<if test="(colPickMode==0 and data.containsKey('staffIdIncrement')) or (colPickMode==1 and !data.containsKey('staffIdIncrement'))">
a.staffId=ifnull(a.staffId,0) + #{data.staffIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))">
a.openId=#{data.openId},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -250,20 +294,6 @@ ...@@ -250,20 +294,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteIds=(case" suffix="ELSE siteIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteIds')) or (colPickMode==1 and !item.containsKey('siteIds'))">
when a.id=#{item.id} then #{item.siteIds}
</if>
</foreach>
</trim>
<trim prefix="areaCodes=(case" suffix="ELSE areaCodes end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaCodes')) or (colPickMode==1 and !item.containsKey('areaCodes'))">
when a.id=#{item.id} then #{item.areaCodes}
</if>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),"> <trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -276,6 +306,18 @@ ...@@ -276,6 +306,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="customerId=(case" suffix="ELSE customerId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('customerId')) or (colPickMode==1 and !item.containsKey('customerId'))">
when a.id=#{item.id} then #{item.customerId}
</when>
<when test="(colPickMode==0 and item.containsKey('customerIdIncrement')) or (colPickMode==1 and !item.containsKey('customerIdIncrement'))">
when a.id=#{item.id} then ifnull(a.customerId,0) + #{item.customerIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -316,6 +358,58 @@ ...@@ -316,6 +358,58 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deptId=(case" suffix="ELSE deptId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
when a.id=#{item.id} then #{item.deptId}
</when>
<when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="deptName=(case" suffix="ELSE deptName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
when a.id=#{item.id} then #{item.deptName}
</if>
</foreach>
</trim>
<trim prefix="siteIds=(case" suffix="ELSE siteIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteIds')) or (colPickMode==1 and !item.containsKey('siteIds'))">
when a.id=#{item.id} then #{item.siteIds}
</if>
</foreach>
</trim>
<trim prefix="areaCodes=(case" suffix="ELSE areaCodes end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaCodes')) or (colPickMode==1 and !item.containsKey('areaCodes'))">
when a.id=#{item.id} then #{item.areaCodes}
</if>
</foreach>
</trim>
<trim prefix="staffId=(case" suffix="ELSE staffId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
when a.id=#{item.id} then #{item.staffId}
</when>
<when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="openId=(case" suffix="ELSE openId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('openId')) or (colPickMode==1 and !item.containsKey('openId'))">
when a.id=#{item.id} then #{item.openId}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -339,6 +433,21 @@ ...@@ -339,6 +433,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_user where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_user where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_user as a delete a.* from mortals_xhx_user as a
...@@ -425,12 +534,18 @@ ...@@ -425,12 +534,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -447,12 +562,18 @@ ...@@ -447,12 +562,18 @@
${_conditionType_} a.loginName is null ${_conditionType_} a.loginName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('loginNameList')"> <if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in ${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')"> <if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''"> <if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
...@@ -462,12 +583,18 @@ ...@@ -462,12 +583,18 @@
${_conditionType_} a.loginPwd is null ${_conditionType_} a.loginPwd is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('loginPwdList')"> <if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in ${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
${_conditionType_} a.loginPwd not in
<foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginLimitAddress')"> <if test="conditionParamRef.containsKey('loginLimitAddress')">
<if test="conditionParamRef.loginLimitAddress != null and conditionParamRef.loginLimitAddress != ''"> <if test="conditionParamRef.loginLimitAddress != null and conditionParamRef.loginLimitAddress != ''">
...@@ -477,12 +604,18 @@ ...@@ -477,12 +604,18 @@
${_conditionType_} a.loginLimitAddress is null ${_conditionType_} a.loginLimitAddress is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('loginLimitAddressList')"> <if test="conditionParamRef.containsKey('loginLimitAddressList') and conditionParamRef.loginLimitAddressList.size() > 0">
${_conditionType_} a.loginLimitAddress in ${_conditionType_} a.loginLimitAddress in
<foreach collection="conditionParamRef.loginLimitAddressList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.loginLimitAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('loginLimitAddressNotList') and conditionParamRef.loginLimitAddressNotList.size() > 0">
${_conditionType_} a.loginLimitAddress not in
<foreach collection="conditionParamRef.loginLimitAddressNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('realName')"> <if test="conditionParamRef.containsKey('realName')">
<if test="conditionParamRef.realName != null and conditionParamRef.realName != ''"> <if test="conditionParamRef.realName != null and conditionParamRef.realName != ''">
...@@ -492,12 +625,18 @@ ...@@ -492,12 +625,18 @@
${_conditionType_} a.realName is null ${_conditionType_} a.realName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('realNameList')"> <if test="conditionParamRef.containsKey('realNameList') and conditionParamRef.realNameList.size() > 0">
${_conditionType_} a.realName in ${_conditionType_} a.realName in
<foreach collection="conditionParamRef.realNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.realNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('realNameNotList') and conditionParamRef.realNameNotList.size() > 0">
${_conditionType_} a.realName not in
<foreach collection="conditionParamRef.realNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobile')"> <if test="conditionParamRef.containsKey('mobile')">
<if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''"> <if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
...@@ -507,12 +646,18 @@ ...@@ -507,12 +646,18 @@
${_conditionType_} a.mobile is null ${_conditionType_} a.mobile is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('mobileList')"> <if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in ${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('phone')"> <if test="conditionParamRef.containsKey('phone')">
<if test="conditionParamRef.phone != null and conditionParamRef.phone != ''"> <if test="conditionParamRef.phone != null and conditionParamRef.phone != ''">
...@@ -522,12 +667,18 @@ ...@@ -522,12 +667,18 @@
${_conditionType_} a.phone is null ${_conditionType_} a.phone is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('phoneList')"> <if test="conditionParamRef.containsKey('phoneList') and conditionParamRef.phoneList.size() > 0">
${_conditionType_} a.phone in ${_conditionType_} a.phone in
<foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('phoneNotList') and conditionParamRef.phoneNotList.size() > 0">
${_conditionType_} a.phone not in
<foreach collection="conditionParamRef.phoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('email')"> <if test="conditionParamRef.containsKey('email')">
<if test="conditionParamRef.email != null and conditionParamRef.email != ''"> <if test="conditionParamRef.email != null and conditionParamRef.email != ''">
...@@ -537,12 +688,18 @@ ...@@ -537,12 +688,18 @@
${_conditionType_} a.email is null ${_conditionType_} a.email is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('emailList')"> <if test="conditionParamRef.containsKey('emailList') and conditionParamRef.emailList.size() > 0">
${_conditionType_} a.email in ${_conditionType_} a.email in
<foreach collection="conditionParamRef.emailList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.emailList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('emailNotList') and conditionParamRef.emailNotList.size() > 0">
${_conditionType_} a.email not in
<foreach collection="conditionParamRef.emailNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('qq')"> <if test="conditionParamRef.containsKey('qq')">
<if test="conditionParamRef.qq != null and conditionParamRef.qq != ''"> <if test="conditionParamRef.qq != null and conditionParamRef.qq != ''">
...@@ -552,12 +709,18 @@ ...@@ -552,12 +709,18 @@
${_conditionType_} a.qq is null ${_conditionType_} a.qq is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('qqList')"> <if test="conditionParamRef.containsKey('qqList') and conditionParamRef.qqList.size() > 0">
${_conditionType_} a.qq in ${_conditionType_} a.qq in
<foreach collection="conditionParamRef.qqList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.qqList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('qqNotList') and conditionParamRef.qqNotList.size() > 0">
${_conditionType_} a.qq not in
<foreach collection="conditionParamRef.qqNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userType')"> <if test="conditionParamRef.containsKey('userType')">
<if test="conditionParamRef.userType != null "> <if test="conditionParamRef.userType != null ">
${_conditionType_} a.userType = #{${_conditionParam_}.userType} ${_conditionType_} a.userType = #{${_conditionParam_}.userType}
...@@ -566,12 +729,18 @@ ...@@ -566,12 +729,18 @@
${_conditionType_} a.userType is null ${_conditionType_} a.userType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('userTypeList')"> <if test="conditionParamRef.containsKey('userTypeList') and conditionParamRef.userTypeList.size() > 0">
${_conditionType_} a.userType in ${_conditionType_} a.userType in
<foreach collection="conditionParamRef.userTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.userTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('userTypeNotList') and conditionParamRef.userTypeNotList.size() > 0">
${_conditionType_} a.userType not in
<foreach collection="conditionParamRef.userTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userTypeStart') and conditionParamRef.userTypeStart != null"> <if test="conditionParamRef.containsKey('userTypeStart') and conditionParamRef.userTypeStart != null">
${_conditionType_} a.userType <![CDATA[ >= ]]> #{${_conditionParam_}.userTypeStart} ${_conditionType_} a.userType <![CDATA[ >= ]]> #{${_conditionParam_}.userTypeStart}
</if> </if>
...@@ -579,36 +748,6 @@ ...@@ -579,36 +748,6 @@
${_conditionType_} a.userType <![CDATA[ <= ]]> #{${_conditionParam_}.userTypeEnd} ${_conditionType_} a.userType <![CDATA[ <= ]]> #{${_conditionParam_}.userTypeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteIds')">
<if test="conditionParamRef.siteIds != null and conditionParamRef.siteIds != ''">
${_conditionType_} a.siteIds like #{${_conditionParam_}.siteIds}
</if>
<if test="conditionParamRef.siteIds == null">
${_conditionType_} a.siteIds is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdsList')">
${_conditionType_} a.siteIds in
<foreach collection="conditionParamRef.siteIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCodes')">
<if test="conditionParamRef.areaCodes != null and conditionParamRef.areaCodes != ''">
${_conditionType_} a.areaCodes like #{${_conditionParam_}.areaCodes}
</if>
<if test="conditionParamRef.areaCodes == null">
${_conditionType_} a.areaCodes is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaCodesList')">
${_conditionType_} a.areaCodes in
<foreach collection="conditionParamRef.areaCodesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('status')"> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null "> <if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status} ${_conditionType_} a.status = #{${_conditionParam_}.status}
...@@ -617,12 +756,18 @@ ...@@ -617,12 +756,18 @@
${_conditionType_} a.status is null ${_conditionType_} a.status is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('statusList')"> <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in ${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if> </if>
...@@ -630,6 +775,33 @@ ...@@ -630,6 +775,33 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('customerId')">
<if test="conditionParamRef.customerId != null ">
${_conditionType_} a.customerId = #{${_conditionParam_}.customerId}
</if>
<if test="conditionParamRef.customerId == null">
${_conditionType_} a.customerId is null
</if>
</if>
<if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
${_conditionType_} a.customerId not in
<foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if>
<if test="conditionParamRef.containsKey('customerIdEnd') and conditionParamRef.customerIdEnd != null">
${_conditionType_} a.customerId <![CDATA[ <= ]]> #{${_conditionParam_}.customerIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -653,12 +825,18 @@ ...@@ -653,12 +825,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -675,12 +853,18 @@ ...@@ -675,12 +853,18 @@
${_conditionType_} a.createUserName is null ${_conditionType_} a.createUserName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserNameList')"> <if test="conditionParamRef.containsKey('createUserNameList') and conditionParamRef.createUserNameList.size() > 0">
${_conditionType_} a.createUserName in ${_conditionType_} a.createUserName in
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserNameNotList') and conditionParamRef.createUserNameNotList.size() > 0">
${_conditionType_} a.createUserName not in
<foreach collection="conditionParamRef.createUserNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('lastLoginTime')"> <if test="conditionParamRef.containsKey('lastLoginTime')">
<if test="conditionParamRef.lastLoginTime != null "> <if test="conditionParamRef.lastLoginTime != null ">
...@@ -705,12 +889,156 @@ ...@@ -705,12 +889,156 @@
${_conditionType_} a.lastLoginAddress is null ${_conditionType_} a.lastLoginAddress is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('lastLoginAddressList')"> <if test="conditionParamRef.containsKey('lastLoginAddressList') and conditionParamRef.lastLoginAddressList.size() > 0">
${_conditionType_} a.lastLoginAddress in ${_conditionType_} a.lastLoginAddress in
<foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('lastLoginAddressNotList') and conditionParamRef.lastLoginAddressNotList.size() > 0">
${_conditionType_} a.lastLoginAddress not in
<foreach collection="conditionParamRef.lastLoginAddressNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
</if>
<if test="conditionParamRef.deptId == null">
${_conditionType_} a.deptId is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
${_conditionType_} a.deptId in
<foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
${_conditionType_} a.deptId not in
<foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
</if>
<if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
</if>
<if test="conditionParamRef.containsKey('deptName')">
<if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
</if>
<if test="conditionParamRef.deptName == null">
${_conditionType_} a.deptName is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
${_conditionType_} a.deptName not in
<foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIds')">
<if test="conditionParamRef.siteIds != null and conditionParamRef.siteIds != ''">
${_conditionType_} a.siteIds like #{${_conditionParam_}.siteIds}
</if>
<if test="conditionParamRef.siteIds == null">
${_conditionType_} a.siteIds is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdsList') and conditionParamRef.siteIdsList.size() > 0">
${_conditionType_} a.siteIds in
<foreach collection="conditionParamRef.siteIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdsNotList') and conditionParamRef.siteIdsNotList.size() > 0">
${_conditionType_} a.siteIds not in
<foreach collection="conditionParamRef.siteIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCodes')">
<if test="conditionParamRef.areaCodes != null and conditionParamRef.areaCodes != ''">
${_conditionType_} a.areaCodes like #{${_conditionParam_}.areaCodes}
</if>
<if test="conditionParamRef.areaCodes == null">
${_conditionType_} a.areaCodes is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaCodesList') and conditionParamRef.areaCodesList.size() > 0">
${_conditionType_} a.areaCodes in
<foreach collection="conditionParamRef.areaCodesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCodesNotList') and conditionParamRef.areaCodesNotList.size() > 0">
${_conditionType_} a.areaCodes not in
<foreach collection="conditionParamRef.areaCodesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffId')">
<if test="conditionParamRef.staffId != null ">
${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
</if>
<if test="conditionParamRef.staffId == null">
${_conditionType_} a.staffId is null
</if>
</if>
<if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
${_conditionType_} a.staffId in
<foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
${_conditionType_} a.staffId not in
<foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
</if>
<if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
</if>
<if test="conditionParamRef.containsKey('openId')">
<if test="conditionParamRef.openId != null and conditionParamRef.openId != ''">
${_conditionType_} a.openId like #{${_conditionParam_}.openId}
</if>
<if test="conditionParamRef.openId == null">
${_conditionType_} a.openId is null
</if>
</if>
<if test="conditionParamRef.containsKey('openIdList') and conditionParamRef.openIdList.size() > 0">
${_conditionType_} a.openId in
<foreach collection="conditionParamRef.openIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('openIdNotList') and conditionParamRef.openIdNotList.size() > 0">
${_conditionType_} a.openId not in
<foreach collection="conditionParamRef.openIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -774,21 +1102,16 @@ ...@@ -774,21 +1102,16 @@
<if test='orderCol.userType != null and "DESC".equalsIgnoreCase(orderCol.userType)'>DESC</if> <if test='orderCol.userType != null and "DESC".equalsIgnoreCase(orderCol.userType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteIds')">
a.siteIds
<if test='orderCol.siteIds != null and "DESC".equalsIgnoreCase(orderCol.siteIds)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('areaCodes')">
a.areaCodes
<if test='orderCol.areaCodes != null and "DESC".equalsIgnoreCase(orderCol.areaCodes)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')"> <if test="orderCol.containsKey('status')">
a.status a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('customerId')">
a.customerId
<if test='orderCol.customerId != null and "DESC".equalsIgnoreCase(orderCol.customerId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
...@@ -814,6 +1137,36 @@ ...@@ -814,6 +1137,36 @@
<if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if> <if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deptId')">
a.deptId
<if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptName')">
a.deptName
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteIds')">
a.siteIds
<if test='orderCol.siteIds != null and "DESC".equalsIgnoreCase(orderCol.siteIds)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('areaCodes')">
a.areaCodes
<if test='orderCol.areaCodes != null and "DESC".equalsIgnoreCase(orderCol.areaCodes)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('staffId')">
a.staffId
<if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('openId')">
a.openId
<if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment