Skip to content

O
one-certificate-system
Commit e7c20c05 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 8e07e395 f106a3ca
Hide whitespace changes
Inline Side-by-side
Showing with 1176 additions and 143 deletions
one-certificate-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
View file @ e7c20c05
......@@ -58,12 +58,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
// 令牌前缀
@Value("${token.prefix:}")
private String tokenPrefix;
// redis db
@Value("${spring.redis.database:}")
private Integer db;
@Value("${token.database:0}")
private Integer portalDb;
protected static final Long SECOND = 1l;
......@@ -104,11 +99,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
Claims claims = parseToken(token);
String uuid = (String) claims.get(SysConstains.LOGIN_USER_KEY);
String userKey = getTokenKey(uuid);
//cacheService.select(portalDb);
String userStr = cacheService.get(userKey);
/* RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
String userStr =redisTemplate.opsForValue().get(userKey);
*/
//刷新token时间
UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
if (!ObjectUtils.isEmpty(userEntity)) {
......
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @ e7c20c05
package com.mortals.xhx.base.system.user.model;
import com.mortals.framework.annotation.desensitization.MobileDesensitize;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.service.IUser;
import com.mortals.xhx.base.system.user.model.vo.UserVo;
......@@ -34,6 +35,7 @@ public class UserEntity extends UserVo implements IUser {
/**
* 用户手机号
*/
@MobileDesensitize
private String mobile;
/**
* 用户联系电话
......@@ -48,9 +50,19 @@ public class UserEntity extends UserVo implements IUser {
*/
private String qq;
/**
* 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 用户类型(0.系统用户,1.普通用户,2.工作人员,3.巡查人员,4.窗口负责人)
*/
private Integer userType;
/**
* 用户所属部门id
*/
private Long deptId;
/**
* 所属部门名称
*/
private String deptName;
/**
* 所属站点id,多个逗号分隔
*/
......@@ -76,7 +88,23 @@ public class UserEntity extends UserVo implements IUser {
*/
private String lastLoginAddress;
/**
* 员工id
*/
private Long customerId;
/**
* 钉钉userId
*/
private String dingUserId;
public String getDingUserId() {
return dingUserId;
}
public void setDingUserId(String dingUserId) {
this.dingUserId = dingUserId;
}
public UserEntity(){}
/**
......@@ -100,6 +128,15 @@ public class UserEntity extends UserVo implements IUser {
public String getLoginPwd(){
return loginPwd;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwd
......@@ -132,6 +169,7 @@ public class UserEntity extends UserVo implements IUser {
@Override
public boolean isAdmin() {
return super.getId() == null ? false : super.getId().longValue() == SysConstains.ADMIN_ID;
// return true;
}
@Override
......@@ -208,7 +246,7 @@ public class UserEntity extends UserVo implements IUser {
this.qq = qq;
}
/**
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员,3.普通员工)
* @return Integer
*/
public Integer getUserType(){
......@@ -224,17 +262,17 @@ public class UserEntity extends UserVo implements IUser {
@Override
public Long getDeptId() {
return null;
return this.deptId;
}
@Override
public String getDeptName() {
return null;
return this.deptName;
}
@Override
public Long getCustomerId() {
return null;
return this.customerId;
}
@Override
......@@ -339,7 +377,9 @@ public class UserEntity extends UserVo implements IUser {
}
public void setCustomerId(Long customerId) {
this.customerId = customerId;
}
@Override
public int hashCode() {
......
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java 0 → 100644
View file @ e7c20c05
package com.mortals.xhx.base.system.user.model;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
/**
* Description:User
* date: 2021-9-26 16:11:48
*/
@Data
public class UserEntityExt extends BaseEntityLong {
/**
* 站点名称
*/
private String siteName;
private String roleIds;
/**
* 唯一标识
*/
private String token;
/**
* 菜单栏
*/
private String menuUrl;
/**
* 登录时间
*/
private Long loginTime;
/**
* 过期时间
*/
private Long expireTime;
private Long deptId;
private String deptName;
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserQuery.java
View file @ e7c20c05
package com.mortals.xhx.base.system.user.model;
import java.util.List;
/**
* 用户信息业务查询对象
*
* @author zxfei
* @date 2022-07-06
* @date 2023-03-09
*/
public class UserQuery extends UserEntity {
/** 开始 用户ID，主键，自增长 */
......@@ -21,48 +21,94 @@ public class UserQuery extends UserEntity {
/** 用户ID，主键，自增长列表 */
private List <Long> idList;
/** 用户ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 登录名 */
private List<String> loginNameList;
/** 登录名排除列表 */
private List <String> loginNameNotList;
/** 登录密码，使用md5双次加密 */
private List<String> loginPwdList;
/** 登录密码，使用md5双次加密排除列表 */
private List <String> loginPwdNotList;
/** 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录 */
private List<String> loginLimitAddressList;
/** 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录排除列表 */
private List <String> loginLimitAddressNotList;
/** 用户名 */
private List<String> realNameList;
/** 用户名排除列表 */
private List <String> realNameNotList;
/** 用户手机号 */
private List<String> mobileList;
/** 用户手机号排除列表 */
private List <String> mobileNotList;
/** 用户联系电话 */
private List<String> phoneList;
/** 用户联系电话排除列表 */
private List <String> phoneNotList;
/** 用户邮箱 */
private List<String> emailList;
/** 用户邮箱排除列表 */
private List <String> emailNotList;
/** QQ号码 */
private List<String> qqList;
/** 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) */
/** QQ号码排除列表 */
private List <String> qqNotList;
/** 开始 用户类型(0.系统用户,1.后台管理,2.工作人员) */
private Integer userTypeStart;
/** 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) */
/** 结束 用户类型(0.系统用户,1.后台管理,2.工作人员) */
private Integer userTypeEnd;
/** 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) */
/** 增加 用户类型(0.系统用户,1.后台管理,2.工作人员) */
private Integer userTypeIncrement;
/** 用户类型(0.系统用户,1.普通用户,2.工作人员)列表 */
/** 用户类型(0.系统用户,1.后台管理,2.工作人员)列表 */
private List <Integer> userTypeList;
/** 用户类型(0.系统用户,1.后台管理,2.工作人员)排除列表 */
private List <Integer> userTypeNotList;
/** 开始 用户所属部门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;
/** 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusStart;
......@@ -75,6 +121,9 @@ public class UserQuery extends UserEntity {
/** 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)列表 */
private List <Integer> statusList;
/** 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)排除列表 */
private List <Integer> statusNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -93,9 +142,14 @@ public class UserQuery extends UserEntity {
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 创建用户名称 */
private List<String> createUserNameList;
/** 创建用户名称排除列表 */
private List <String> createUserNameNotList;
/** 开始 最后一次登录时间 */
private String lastLoginTimeStart;
......@@ -105,6 +159,16 @@ public class UserQuery extends UserEntity {
/** 最后一次登录地址 */
private List<String> lastLoginAddressList;
/** 最后一次登录地址排除列表 */
private List <String> lastLoginAddressNotList;
/** 钉钉userId */
private List<String> dingUserIdList;
/** 钉钉userId排除列表 */
private List <String> dingUserIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<UserQuery> orConditionList;
......@@ -177,6 +241,23 @@ public class UserQuery extends UserEntity {
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
......@@ -192,6 +273,23 @@ public class UserQuery extends UserEntity {
public void setLoginNameList(List<String> 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双次加密
* @return loginPwdList
......@@ -207,6 +305,23 @@ public class UserQuery extends UserEntity {
public void setLoginPwdList(List<String> 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可以登录
* @return loginLimitAddressList
......@@ -222,6 +337,23 @@ public class UserQuery extends UserEntity {
public void setLoginLimitAddressList(List<String> 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
......@@ -237,6 +369,23 @@ public class UserQuery extends UserEntity {
public void setRealNameList(List<String> 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
......@@ -252,6 +401,23 @@ public class UserQuery extends UserEntity {
public void setMobileList(List<String> 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
......@@ -267,6 +433,23 @@ public class UserQuery extends UserEntity {
public void setPhoneList(List<String> 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
......@@ -282,6 +465,23 @@ public class UserQuery extends UserEntity {
public void setEmailList(List<String> 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号码
* @return qqList
......@@ -297,8 +497,25 @@ public class UserQuery extends UserEntity {
public void setQqList(List<String> 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.工作人员)
* @return userTypeStart
*/
public Integer getUserTypeStart(){
......@@ -306,7 +523,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 开始 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeStart
*/
public void setUserTypeStart(Integer userTypeStart){
......@@ -314,7 +531,7 @@ public class UserQuery extends UserEntity {
}
/**
* 获取 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 获取 结束 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @return $userTypeEnd
*/
public Integer getUserTypeEnd(){
......@@ -322,7 +539,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 结束 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeEnd
*/
public void setUserTypeEnd(Integer userTypeEnd){
......@@ -330,7 +547,7 @@ public class UserQuery extends UserEntity {
}
/**
* 获取 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 获取 增加 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @return userTypeIncrement
*/
public Integer getUserTypeIncrement(){
......@@ -338,7 +555,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 增加 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeIncrement
*/
public void setUserTypeIncrement(Integer userTypeIncrement){
......@@ -346,7 +563,7 @@ public class UserQuery extends UserEntity {
}
/**
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 获取 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @return userTypeList
*/
public List<Integer> getUserTypeList(){
......@@ -354,13 +571,143 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeList
*/
public void setUserTypeList(List<Integer> userTypeList){
this.userTypeList = userTypeList;
}
/**
* 获取 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @return userTypeNotList
*/
public List<Integer> getUserTypeNotList(){
return this.userTypeNotList;
}
/**
* 设置 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeNotList
*/
public void setUserTypeNotList(List<Integer> userTypeNotList){
this.userTypeNotList = userTypeNotList;
}
/**
* 获取 开始 用户所属部门id
* @return deptIdStart
*/
public Long getDeptIdStart(){
return this.deptIdStart;
}
/**
* 设置 开始 用户所属部门id
* @param deptIdStart
*/
public void setDeptIdStart(Long deptIdStart){
this.deptIdStart = deptIdStart;
}
/**
* 获取 结束 用户所属部门id
* @return $deptIdEnd
*/
public Long getDeptIdEnd(){
return this.deptIdEnd;
}
/**
* 设置 结束 用户所属部门id
* @param deptIdEnd
*/
public void setDeptIdEnd(Long deptIdEnd){
this.deptIdEnd = deptIdEnd;
}
/**
* 获取 增加 用户所属部门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
......@@ -376,6 +723,23 @@ public class UserQuery extends UserEntity {
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
......@@ -391,6 +755,23 @@ public class UserQuery extends UserEntity {
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;
}
/**
* 获取 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusStart
......@@ -455,6 +836,23 @@ public class UserQuery extends UserEntity {
this.statusList = statusList;
}
/**
* 获取 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -551,6 +949,23 @@ public class UserQuery extends UserEntity {
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
......@@ -566,6 +981,23 @@ public class UserQuery extends UserEntity {
public void setCreateUserNameList(List<String> 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
......@@ -613,6 +1045,23 @@ public class UserQuery extends UserEntity {
public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
}
/**
* 获取 最后一次登录地址
* @return lastLoginAddressNotList
*/
public List<String> getLastLoginAddressNotList(){
return this.lastLoginAddressNotList;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressNotList
*/
public void setLastLoginAddressNotList(List<String> lastLoginAddressNotList){
this.lastLoginAddressNotList = lastLoginAddressNotList;
}
/**
* 设置 用户ID，主键，自增长
* @param id
......@@ -658,6 +1107,15 @@ public class UserQuery extends UserEntity {
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param idNotList
*/
public UserQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 登录名
......@@ -811,7 +1269,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userType
*/
public UserQuery userType(Integer userType){
......@@ -820,7 +1278,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 开始 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeStart
*/
public UserQuery userTypeStart(Integer userTypeStart){
......@@ -829,7 +1287,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 结束 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeEnd
*/
public UserQuery userTypeEnd(Integer userTypeEnd){
......@@ -838,7 +1296,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 增加 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeIncrement
*/
public UserQuery userTypeIncrement(Integer userTypeIncrement){
......@@ -847,7 +1305,7 @@ public class UserQuery extends UserEntity {
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* 设置 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeList
*/
public UserQuery userTypeList(List<Integer> userTypeList){
......@@ -855,6 +1313,88 @@ public class UserQuery extends UserEntity {
return this;
}
/**
* 设置 用户类型(0.系统用户,1.后台管理,2.工作人员)
* @param userTypeNotList
*/
public UserQuery userTypeNotList(List<Integer> userTypeNotList){
this.userTypeNotList = userTypeNotList;
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,多个逗号分隔
......@@ -938,6 +1478,15 @@ public class UserQuery extends UserEntity {
return this;
}
/**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusNotList
*/
public UserQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/**
* 设置 创建用户
......@@ -984,6 +1533,15 @@ public class UserQuery extends UserEntity {
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public UserQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 创建用户名称
......@@ -1055,4 +1613,23 @@ public class UserQuery extends UserEntity {
this.andConditionList = andConditionList;
}
/**
* 设置 钉钉userId
* @param dingUserId
*/
public UserQuery dingUserId(String dingUserId){
setDingUserId(dingUserId);
return this;
}
/**
* 设置 钉钉userId
* @param dingUserIdList
*/
public UserQuery dingUserIdList(List<String> dingUserIdList){
this.dingUserIdList = dingUserIdList;
return this;
}
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java
View file @ e7c20c05
......@@ -4,6 +4,8 @@ package com.mortals.xhx.base.system.user.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
import java.util.List;
/**
* 用户信息业务视图对象
*
......@@ -17,7 +19,7 @@ public class UserVo extends BaseEntityLong {
*/
private String siteName;
private String roleIds;
private List<Long> roleIds;
/**
* 唯一标识
*/
......@@ -36,4 +38,6 @@ public class UserVo extends BaseEntityLong {
* 过期时间
*/
private Long expireTime;
String roleIdStrs;
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java
View file @ e7c20c05
package com.mortals.xhx.module.certificate.model;
import java.util.List;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
......@@ -8,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
import lombok.Data;
/**
* 证照目录实体对象
......@@ -99,6 +101,17 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 打印机纸盒
*/
private String paperSource;
/**
* 目录子证信息
*/
private List<CertificateChildEntity> certificateChildList=new ArrayList<>();;
public List<CertificateChildEntity> getCertificateChildList(){
return certificateChildList;
}
public void setCertificateChildList(List<CertificateChildEntity> certificateChildList){
this.certificateChildList = certificateChildList;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ e7c20c05
package com.mortals.xhx.module.certificate.model;
import java.util.List;
import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
/**
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateCatalogServiceImpl.java
View file @ e7c20c05
......@@ -8,24 +8,32 @@ import com.mortals.xhx.common.code.ClassifyType;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.certificate.dao.CertificateCatalogDao;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
import com.mortals.xhx.module.certificate.model.CertificateChildQuery;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateChildService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* CertificateCatalogService
* 证照目录 service实现
*
* @author zxfei
* @date 2022-10-14
*/
* CertificateCatalogService
* 证照目录 service实现
*
* @author zxfei
* @date 2022-10-14
*/
@Service("certificateCatalogService")
public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<CertificateCatalogDao, CertificateCatalogEntity, Long> implements CertificateCatalogService {
......@@ -41,21 +49,25 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
@Autowired
private CertificateClassifyService certificateClassifyService;
@Autowired
private CertificateChildService certificateChildService;
@Override
protected void saveBefore(CertificateCatalogEntity entity, Context context) throws AppException {
if(StringUtils.isEmpty(entity.getCatalogName())){
if (StringUtils.isEmpty(entity.getCatalogName())) {
throw new AppException("目录名称不能为空");
}
if(StringUtils.isEmpty(entity.getCatalogCode())){
if (StringUtils.isEmpty(entity.getCatalogCode())) {
throw new AppException("目录编码不能为空");
}
if(entity.getHolderType()==null){
if (entity.getHolderType() == null) {
throw new AppException("持有者类型不能为空");
}
if(entity.getClassifyId()==null){
if (entity.getClassifyId() == null) {
throw new AppException("目录分类不能为空");
}
if(entity.getIndustryId()==null){
if (entity.getIndustryId() == null) {
throw new AppException("所属行业不能为空");
}
......@@ -63,19 +75,19 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
@Override
protected void updateBefore(CertificateCatalogEntity entity, Context context) throws AppException {
if(StringUtils.isEmpty(entity.getCatalogName())){
if (StringUtils.isEmpty(entity.getCatalogName())) {
throw new AppException("目录名称不能为空");
}
if(StringUtils.isEmpty(entity.getCatalogCode())){
if (StringUtils.isEmpty(entity.getCatalogCode())) {
throw new AppException("目录编码不能为空");
}
if(entity.getHolderType()==null){
if (entity.getHolderType() == null) {
throw new AppException("持有者类型不能为空");
}
if(entity.getClassifyId()==null){
if (entity.getClassifyId() == null) {
throw new AppException("目录分类不能为空");
}
if(entity.getIndustryId()==null){
if (entity.getIndustryId() == null) {
throw new AppException("所属行业不能为空");
}
......@@ -84,7 +96,7 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
@Override
protected CertificateCatalogEntity findBefore(CertificateCatalogEntity params, PageInfo pageInfo, Context context) throws AppException {
if(StringUtils.isNotEmpty(params.getCatalogName())){
if (StringUtils.isNotEmpty(params.getCatalogName())) {
params.setCatalogName("%".concat(params.getCatalogName()).concat("%"));
}
return params;
......@@ -92,20 +104,72 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
@Override
protected void findAfter(CertificateCatalogEntity params, PageInfo pageInfo, Context context, List<CertificateCatalogEntity> list) throws AppException {
if(CollectionUtils.isNotEmpty(list)){
for(CertificateCatalogEntity entity:list){
if (CollectionUtils.isNotEmpty(list)) {
for (CertificateCatalogEntity entity : list) {
CertificateClassifyEntity certificateClassifyEntity = certificateClassifyService.get(entity.getClassifyId());
if(certificateClassifyEntity!=null){
if (certificateClassifyEntity != null) {
entity.setClassifyType(certificateClassifyEntity.getClassifyType());
}else {
} else {
entity.setClassifyType(ClassifyType.PRINCIPAL.getValue());
}
}
}
fillSubData(list);
}
@Override
protected void findAfter(CertificateCatalogEntity params, Context context, List<CertificateCatalogEntity> list) throws AppException {
fillSubData(list);
super.findAfter(params, context, list);
}
private void fillSubData(List<CertificateCatalogEntity> list) {
List<Long> idList = list.stream().map(i -> i.getId()).collect(Collectors.toList());
CertificateChildQuery certificateChildQuery = new CertificateChildQuery();
certificateChildQuery.setCatalogIdList(idList);
Map<Long, List<CertificateChildEntity>> certificateChildListMap = certificateChildService.find(certificateChildQuery).stream().collect(Collectors.groupingBy(CertificateChildEntity::getCatalogId));
list.forEach(item -> item.setCertificateChildList(certificateChildListMap.get(item.getId())));
}
@Override
protected void saveAfter(CertificateCatalogEntity entity, Context context) throws AppException {
if (!ObjectUtils.isEmpty(entity.getCertificateChildList())) {
entity.getCertificateChildList().stream().peek(item -> {
item.setCatalogId(entity.getId());
item.setCreateUserId(this.getContextUserId(context));
item.setCreateTime(new Date());
}).count();
certificateChildService.save(entity.getCertificateChildList());
}
super.saveAfter(entity, context);
}
@Override
protected void updateAfter(CertificateCatalogEntity entity, Context context) throws AppException {
if (!ObjectUtils.isEmpty(entity.getCertificateChildList())) {
Long[] certificateChildIds = certificateChildService.find(new CertificateChildQuery().catalogId(entity.getId())).stream().map(CertificateChildEntity::getId).toArray(Long[]::new);
certificateChildService.remove(certificateChildIds, context);
entity.getCertificateChildList().stream().peek(item -> {
item.setCatalogId(entity.getId());
item.setCreateUserId(this.getContextUserId(context));
item.setCreateTime(new Date());
item.setUpdateUserId(this.getContextUserId(context));
item.setUpdateTime(new Date());
}).count();
certificateChildService.save(entity.getCertificateChildList());
}
super.updateAfter(entity, context);
}
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<CertificateChildEntity> certificateChildlist = certificateChildService.find(new CertificateChildQuery().catalogIdList(Arrays.asList(ids)));
certificateChildService.removeList(certificateChildlist, context);
super.removeAfter(ids, context, result);
}
public static void main(String[] args){
public static void main(String[] args) {
// String excelFilePath = "D:/mortals/app/data/cpm/" + "excel/test1.xls";
// List<String> excelList = new ArrayList<>();
// excelList.add("i_1_姓名");
......
one-certificate-manager/src/main/resources/sqlmap/base/system/user.xml
View file @ e7c20c05
......@@ -15,14 +15,18 @@
<result property="email" column="email" />
<result property="qq" column="qq" />
<result property="userType" column="userType" />
<result property="siteIds" column="siteIds" />
<result property="areaCodes" column="areaCodes" />
<result property="status" column="status" />
<result property="customerId" column="customerId" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" />
<result property="lastLoginTime" column="lastLoginTime" />
<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="dingUserId" column="dingUserId" />
</resultMap>
......@@ -60,15 +64,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userType') or colPickMode == 1 and data.containsKey('userType')))">
a.userType,
</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')))">
a.status,
</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')))">
a.createTime,
</if>
......@@ -84,23 +85,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))">
a.lastLoginAddress,
</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('dingUserId') or colPickMode == 1 and data.containsKey('dingUserId')))">
a.dingUserId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
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,dingUserId)
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},#{dingUserId})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
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,dingUserId)
VALUES
<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.dingUserId})
</foreach>
</insert>
......@@ -140,18 +156,18 @@
<if test="(colPickMode==0 and data.containsKey('userTypeIncrement')) or (colPickMode==1 and !data.containsKey('userTypeIncrement'))">
a.userType=ifnull(a.userType,0) + #{data.userTypeIncrement},
</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'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</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'))">
a.createTime=#{data.createTime},
</if>
......@@ -170,6 +186,24 @@
<if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))">
a.lastLoginAddress=#{data.lastLoginAddress},
</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('dingUserId')) or (colPickMode==1 and !data.containsKey('dingUserId'))">
a.dingUserId=#{data.dingUserId},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -250,20 +284,6 @@
</choose>
</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="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -276,6 +296,18 @@
</choose>
</foreach>
</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),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
......@@ -316,6 +348,46 @@
</if>
</foreach>
</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="dingUserId=(case" suffix="ELSE dingUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dingUserId')) or (colPickMode==1 and !item.containsKey('dingUserId'))">
when a.id=#{item.id} then #{item.dingUserId}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -339,6 +411,21 @@
#{item}
</foreach>
</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删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_user as a
......@@ -425,12 +512,18 @@
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
......@@ -447,12 +540,18 @@
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList')">
<if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.loginPwd != null and conditionParamRef.loginPwd != ''">
......@@ -462,12 +561,18 @@
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList')">
<if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.loginLimitAddress != null and conditionParamRef.loginLimitAddress != ''">
......@@ -477,12 +582,18 @@
${_conditionType_} a.loginLimitAddress is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginLimitAddressList')">
<if test="conditionParamRef.containsKey('loginLimitAddressList') and conditionParamRef.loginLimitAddressList.size() > 0">
${_conditionType_} a.loginLimitAddress in
<foreach collection="conditionParamRef.loginLimitAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.realName != null and conditionParamRef.realName != ''">
......@@ -492,12 +603,18 @@
${_conditionType_} a.realName is null
</if>
</if>
<if test="conditionParamRef.containsKey('realNameList')">
<if test="conditionParamRef.containsKey('realNameList') and conditionParamRef.realNameList.size() > 0">
${_conditionType_} a.realName in
<foreach collection="conditionParamRef.realNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.mobile != null and conditionParamRef.mobile != ''">
......@@ -507,12 +624,18 @@
${_conditionType_} a.mobile is null
</if>
</if>
<if test="conditionParamRef.containsKey('mobileList')">
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.phone != null and conditionParamRef.phone != ''">
......@@ -522,12 +645,18 @@
${_conditionType_} a.phone is null
</if>
</if>
<if test="conditionParamRef.containsKey('phoneList')">
<if test="conditionParamRef.containsKey('phoneList') and conditionParamRef.phoneList.size() > 0">
${_conditionType_} a.phone in
<foreach collection="conditionParamRef.phoneList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.email != null and conditionParamRef.email != ''">
......@@ -537,12 +666,18 @@
${_conditionType_} a.email is null
</if>
</if>
<if test="conditionParamRef.containsKey('emailList')">
<if test="conditionParamRef.containsKey('emailList') and conditionParamRef.emailList.size() > 0">
${_conditionType_} a.email in
<foreach collection="conditionParamRef.emailList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.qq != null and conditionParamRef.qq != ''">
......@@ -552,12 +687,18 @@
${_conditionType_} a.qq is null
</if>
</if>
<if test="conditionParamRef.containsKey('qqList')">
<if test="conditionParamRef.containsKey('qqList') and conditionParamRef.qqList.size() > 0">
${_conditionType_} a.qq in
<foreach collection="conditionParamRef.qqList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.userType != null ">
${_conditionType_} a.userType = #{${_conditionParam_}.userType}
......@@ -566,12 +707,18 @@
${_conditionType_} a.userType is null
</if>
</if>
<if test="conditionParamRef.containsKey('userTypeList')">
<if test="conditionParamRef.containsKey('userTypeList') and conditionParamRef.userTypeList.size() > 0">
${_conditionType_} a.userType in
<foreach collection="conditionParamRef.userTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.userType <![CDATA[ >= ]]> #{${_conditionParam_}.userTypeStart}
</if>
......@@ -579,36 +726,6 @@
${_conditionType_} a.userType <![CDATA[ <= ]]> #{${_conditionParam_}.userTypeEnd}
</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.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
......@@ -617,12 +734,18 @@
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
<if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
......@@ -630,6 +753,33 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</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.createTime != null ">
......@@ -653,12 +803,18 @@
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
......@@ -675,12 +831,18 @@
${_conditionType_} a.createUserName is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserNameList')">
<if test="conditionParamRef.containsKey('createUserNameList') and conditionParamRef.createUserNameList.size() > 0">
${_conditionType_} a.createUserName in
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.lastLoginTime != null ">
......@@ -705,12 +867,129 @@
${_conditionType_} a.lastLoginAddress is null
</if>
</if>
<if test="conditionParamRef.containsKey('lastLoginAddressList')">
<if test="conditionParamRef.containsKey('lastLoginAddressList') and conditionParamRef.lastLoginAddressList.size() > 0">
${_conditionType_} a.lastLoginAddress in
<foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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('dingUserId')">
<if test="conditionParamRef.dingUserId != null and conditionParamRef.dingUserId != ''">
${_conditionType_} a.dingUserId like #{${_conditionParam_}.dingUserId}
</if>
<if test="conditionParamRef.dingUserId == null">
${_conditionType_} a.dingUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('dingUserIdList') and conditionParamRef.dingUserIdList.size() > 0">
${_conditionType_} a.dingUserId in
<foreach collection="conditionParamRef.dingUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dingUserIdNotList') and conditionParamRef.dingUserIdNotList.size() > 0">
${_conditionType_} a.dingUserId not in
<foreach collection="conditionParamRef.dingUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -774,21 +1053,16 @@
<if test='orderCol.userType != null and "DESC".equalsIgnoreCase(orderCol.userType)'>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('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</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')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......@@ -814,6 +1088,31 @@
<if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</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('dingUserId')">
a.dingUserId
<if test='orderCol.dingUserId != null and "DESC".equalsIgnoreCase(orderCol.dingUserId)'>DESC</if>
,
</if>
</trim>
</if>
</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