From 8f8a512dee4eefea43f18591085e1b13abd3bb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 28 Apr 2025 19:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
agent-manager/db/add.sql | 25 +-
.../resources/sqlmap/base/system/user.xml | 383 +++---------------
2 files changed, 91 insertions(+), 317 deletions(-)
diff --git a/agent-manager/db/add.sql b/agent-manager/db/add.sql
index 4aab600..f90f2fa 100644
--- a/agent-manager/db/add.sql
+++ b/agent-manager/db/add.sql
@@ -254,4 +254,27 @@ CREATE TABLE `mortals_agent_user`
UNIQUE KEY `idx_loginName` (`loginName`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=ujis ROW_FORMAT=DYNAMIC COMMENT='鐢ㄦ埛淇℃伅';
-
+DROP TABLE IF EXISTS `mortals_agent_user`;
+CREATE TABLE `mortals_agent_user` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鐢ㄦ埛ID锛屼富閿紝鑷闀�',
+ `loginName` varchar(50) DEFAULT NULL COMMENT '鐧诲綍鍚�',
+ `loginPwd` varchar(128) DEFAULT NULL COMMENT '鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑',
+ `loginLimitAddress` varchar(200) DEFAULT NULL COMMENT '鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍',
+ `realName` varchar(64) DEFAULT NULL COMMENT '鐢ㄦ埛鍚�',
+ `mobile` varchar(21) DEFAULT NULL COMMENT '鐢ㄦ埛鎵嬫満鍙�',
+ `phone` varchar(21) DEFAULT NULL COMMENT '鐢ㄦ埛鑱旂郴鐢佃瘽',
+ `email` varchar(50) DEFAULT NULL COMMENT '鐢ㄦ埛閭',
+ `qq` varchar(20) DEFAULT NULL COMMENT 'QQ鍙风爜',
+ `open_id` varchar(128) CHARACTER SET utf8 DEFAULT NULL COMMENT 'openId,缁戝畾浼佷笟',
+ `company_id` bigint(20) DEFAULT NULL COMMENT '缁戝畾鍏徃浼佷笟id',
+ `userType` tinyint(2) DEFAULT NULL COMMENT '鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.鍏徃浼佷笟鐢ㄦ埛)',
+ `siteIds` varchar(512) DEFAULT NULL COMMENT '鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧',
+ `areaCodes` varchar(512) DEFAULT NULL COMMENT '鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧',
+ `status` tinyint(2) DEFAULT NULL COMMENT '鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)',
+ `createTime` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ `lastLoginTime` datetime DEFAULT NULL COMMENT '鏈€鍚庝竴娆＄櫥褰曟椂闂�',
+ `lastLoginAddress` varchar(21) DEFAULT NULL COMMENT '鏈€鍚庝竴娆＄櫥褰曞湴鍧€',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='鐢ㄦ埛淇℃伅涓氬姟';
\ No newline at end of file
diff --git a/agent-manager/src/main/resources/sqlmap/base/system/user.xml b/agent-manager/src/main/resources/sqlmap/base/system/user.xml
index 6a1d073..1dc209f 100644
--- a/agent-manager/src/main/resources/sqlmap/base/system/user.xml
+++ b/agent-manager/src/main/resources/sqlmap/base/system/user.xml
@@ -8,9 +8,6 @@
<id property="id" column="id" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
- <result property="loginPwd1" column="loginPwd1" />
- <result property="loginPwd2" column="loginPwd2" />
- <result property="loginPwd3" column="loginPwd3" />
<result property="loginLimitAddress" column="loginLimitAddress" />
<result property="realName" column="realName" />
<result property="mobile" column="mobile" />
@@ -20,16 +17,14 @@
<result property="openId" column="open_id" />
<result property="companyId" column="company_id" />
<result property="userType" column="userType" />
- <result property="siteId" column="siteId" />
+ <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="lastModPwdTime" column="lastModPwdTime" />
- <result property="lastModPwdAddr" column="lastModPwdAddr" />
</resultMap>
<!-- 琛ㄦ墍鏈夊垪 -->
@@ -44,15 +39,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd1') or colPickMode == 1 and data.containsKey('loginPwd1')))">
- a.loginPwd1,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd2') or colPickMode == 1 and data.containsKey('loginPwd2')))">
- a.loginPwd2,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd3') or colPickMode == 1 and data.containsKey('loginPwd3')))">
- a.loginPwd3,
- </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginLimitAddress') or colPickMode == 1 and data.containsKey('loginLimitAddress')))">
a.loginLimitAddress,
</if>
@@ -80,15 +66,15 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
- a.siteId,
+ <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>
@@ -104,29 +90,23 @@
<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('lastModPwdTime') or colPickMode == 1 and data.containsKey('lastModPwdTime')))">
- a.lastModPwdTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastModPwdAddr') or colPickMode == 1 and data.containsKey('lastModPwdAddr')))">
- a.lastModPwdAddr,
- </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_agent_user
- (loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,open_id,company_id,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr)
+ (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,open_id,company_id,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES
- (#{loginName},#{loginPwd},#{loginPwd1},#{loginPwd2},#{loginPwd3},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{openId},#{companyId},#{userType},#{siteId},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress},#{lastModPwdTime},#{lastModPwdAddr})
+ (#{loginName},#{loginPwd},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{openId},#{companyId},#{userType},#{siteIds},#{areaCodes},#{status},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_agent_user
- (loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,open_id,company_id,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr)
+ (loginName,loginPwd,loginLimitAddress,realName,mobile,phone,email,qq,open_id,company_id,userType,siteIds,areaCodes,status,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.loginName},#{item.loginPwd},#{item.loginPwd1},#{item.loginPwd2},#{item.loginPwd3},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.openId},#{item.companyId},#{item.userType},#{item.siteId},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress},#{item.lastModPwdTime},#{item.lastModPwdAddr})
+ (#{item.loginName},#{item.loginPwd},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.openId},#{item.companyId},#{item.userType},#{item.siteIds},#{item.areaCodes},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach>
</insert>
@@ -142,15 +122,6 @@
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
- <if test="(colPickMode==0 and data.containsKey('loginPwd1')) or (colPickMode==1 and !data.containsKey('loginPwd1'))">
- a.loginPwd1=#{data.loginPwd1},
- </if>
- <if test="(colPickMode==0 and data.containsKey('loginPwd2')) or (colPickMode==1 and !data.containsKey('loginPwd2'))">
- a.loginPwd2=#{data.loginPwd2},
- </if>
- <if test="(colPickMode==0 and data.containsKey('loginPwd3')) or (colPickMode==1 and !data.containsKey('loginPwd3'))">
- a.loginPwd3=#{data.loginPwd3},
- </if>
<if test="(colPickMode==0 and data.containsKey('loginLimitAddress')) or (colPickMode==1 and !data.containsKey('loginLimitAddress'))">
a.loginLimitAddress=#{data.loginLimitAddress},
</if>
@@ -184,11 +155,11 @@
<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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
- a.siteId=#{data.siteId},
+ <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('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
- a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+ <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},
@@ -196,12 +167,6 @@
<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>
@@ -220,12 +185,6 @@
<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('lastModPwdTime')) or (colPickMode==1 and !data.containsKey('lastModPwdTime'))">
- a.lastModPwdTime=#{data.lastModPwdTime},
- </if>
- <if test="(colPickMode==0 and data.containsKey('lastModPwdAddr')) or (colPickMode==1 and !data.containsKey('lastModPwdAddr'))">
- a.lastModPwdAddr=#{data.lastModPwdAddr},
- </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -252,27 +211,6 @@
</if>
</foreach>
</trim>
- <trim prefix="loginPwd1=(case" suffix="ELSE loginPwd1 end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('loginPwd1')) or (colPickMode==1 and !item.containsKey('loginPwd1'))">
- when a.id=#{item.id} then #{item.loginPwd1}
- </if>
- </foreach>
- </trim>
- <trim prefix="loginPwd2=(case" suffix="ELSE loginPwd2 end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('loginPwd2')) or (colPickMode==1 and !item.containsKey('loginPwd2'))">
- when a.id=#{item.id} then #{item.loginPwd2}
- </if>
- </foreach>
- </trim>
- <trim prefix="loginPwd3=(case" suffix="ELSE loginPwd3 end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('loginPwd3')) or (colPickMode==1 and !item.containsKey('loginPwd3'))">
- when a.id=#{item.id} then #{item.loginPwd3}
- </if>
- </foreach>
- </trim>
<trim prefix="loginLimitAddress=(case" suffix="ELSE loginLimitAddress end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginLimitAddress')) or (colPickMode==1 and !item.containsKey('loginLimitAddress'))">
@@ -346,16 +284,18 @@
</choose>
</foreach>
</trim>
- <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+ <trim prefix="siteIds=(case" suffix="ELSE siteIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
- when a.id=#{item.id} then #{item.siteId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
- </when>
- </choose>
+ <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),">
@@ -370,18 +310,6 @@
</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'))">
@@ -422,20 +350,6 @@
</if>
</foreach>
</trim>
- <trim prefix="lastModPwdTime=(case" suffix="ELSE lastModPwdTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('lastModPwdTime')) or (colPickMode==1 and !item.containsKey('lastModPwdTime'))">
- when a.id=#{item.id} then #{item.lastModPwdTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="lastModPwdAddr=(case" suffix="ELSE lastModPwdAddr end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('lastModPwdAddr')) or (colPickMode==1 and !item.containsKey('lastModPwdAddr'))">
- when a.id=#{item.id} then #{item.lastModPwdAddr}
- </if>
- </foreach>
- </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -626,69 +540,6 @@
</foreach>
</if>
- <if test="conditionParamRef.containsKey('loginPwd1')">
- <if test="conditionParamRef.loginPwd1 != null and conditionParamRef.loginPwd1 != ''">
- ${_conditionType_} a.loginPwd1 like #{${_conditionParam_}.loginPwd1}
- </if>
- <if test="conditionParamRef.loginPwd1 == null">
- ${_conditionType_} a.loginPwd1 is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('loginPwd1List') and conditionParamRef.loginPwd1List.size() > 0">
- ${_conditionType_} a.loginPwd1 in
- <foreach collection="conditionParamRef.loginPwd1List" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('loginPwd1NotList') and conditionParamRef.loginPwd1NotList.size() > 0">
- ${_conditionType_} a.loginPwd1 not in
- <foreach collection="conditionParamRef.loginPwd1NotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
-
- <if test="conditionParamRef.containsKey('loginPwd2')">
- <if test="conditionParamRef.loginPwd2 != null and conditionParamRef.loginPwd2 != ''">
- ${_conditionType_} a.loginPwd2 like #{${_conditionParam_}.loginPwd2}
- </if>
- <if test="conditionParamRef.loginPwd2 == null">
- ${_conditionType_} a.loginPwd2 is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('loginPwd2List') and conditionParamRef.loginPwd2List.size() > 0">
- ${_conditionType_} a.loginPwd2 in
- <foreach collection="conditionParamRef.loginPwd2List" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('loginPwd2NotList') and conditionParamRef.loginPwd2NotList.size() > 0">
- ${_conditionType_} a.loginPwd2 not in
- <foreach collection="conditionParamRef.loginPwd2NotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
-
- <if test="conditionParamRef.containsKey('loginPwd3')">
- <if test="conditionParamRef.loginPwd3 != null and conditionParamRef.loginPwd3 != ''">
- ${_conditionType_} a.loginPwd3 like #{${_conditionParam_}.loginPwd3}
- </if>
- <if test="conditionParamRef.loginPwd3 == null">
- ${_conditionType_} a.loginPwd3 is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('loginPwd3List') and conditionParamRef.loginPwd3List.size() > 0">
- ${_conditionType_} a.loginPwd3 in
- <foreach collection="conditionParamRef.loginPwd3List" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('loginPwd3NotList') and conditionParamRef.loginPwd3NotList.size() > 0">
- ${_conditionType_} a.loginPwd3 not in
- <foreach collection="conditionParamRef.loginPwd3NotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
-
<if test="conditionParamRef.containsKey('loginLimitAddress')">
<if test="conditionParamRef.loginLimitAddress != null and conditionParamRef.loginLimitAddress != ''">
${_conditionType_} a.loginLimitAddress like #{${_conditionParam_}.loginLimitAddress}
@@ -889,33 +740,48 @@
${_conditionType_} a.userType <![CDATA[ <= ]]> #{${_conditionParam_}.userTypeEnd}
</if>
- <if test="conditionParamRef.containsKey('siteId')">
- <if test="conditionParamRef.siteId != null ">
- ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+
+ <if test="conditionParamRef.containsKey('siteIds')">
+ <if test="conditionParamRef.siteIds != null and conditionParamRef.siteIds != ''">
+ ${_conditionType_} a.siteIds like #{${_conditionParam_}.siteIds}
</if>
- <if test="conditionParamRef.siteId == null">
- ${_conditionType_} a.siteId is null
+ <if test="conditionParamRef.siteIds == null">
+ ${_conditionType_} a.siteIds is null
</if>
</if>
- <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
- ${_conditionType_} a.siteId in
- <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+ <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('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
- ${_conditionType_} a.siteId not in
- <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ <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('siteIdStart') and conditionParamRef.siteIdStart != null">
- ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+
+ <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('siteIdEnd') and conditionParamRef.siteIdEnd != null">
- ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+ <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('status')">
<if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
@@ -943,33 +809,6 @@
${_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 ">
@@ -1069,42 +908,6 @@
#{item}
</foreach>
</if>
-
- <if test="conditionParamRef.containsKey('lastModPwdTime')">
- <if test="conditionParamRef.lastModPwdTime != null ">
- ${_conditionType_} a.lastModPwdTime = #{${_conditionParam_}.lastModPwdTime}
- </if>
- <if test="conditionParamRef.lastModPwdTime == null">
- ${_conditionType_} a.lastModPwdTime is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('lastModPwdTimeStart') and conditionParamRef.lastModPwdTimeStart != null and conditionParamRef.lastModPwdTimeStart!=''">
- ${_conditionType_} a.lastModPwdTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastModPwdTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('lastModPwdTimeEnd') and conditionParamRef.lastModPwdTimeEnd != null and conditionParamRef.lastModPwdTimeEnd!=''">
- ${_conditionType_} a.lastModPwdTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastModPwdTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
-
- <if test="conditionParamRef.containsKey('lastModPwdAddr')">
- <if test="conditionParamRef.lastModPwdAddr != null and conditionParamRef.lastModPwdAddr != ''">
- ${_conditionType_} a.lastModPwdAddr like #{${_conditionParam_}.lastModPwdAddr}
- </if>
- <if test="conditionParamRef.lastModPwdAddr == null">
- ${_conditionType_} a.lastModPwdAddr is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('lastModPwdAddrList') and conditionParamRef.lastModPwdAddrList.size() > 0">
- ${_conditionType_} a.lastModPwdAddr in
- <foreach collection="conditionParamRef.lastModPwdAddrList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('lastModPwdAddrNotList') and conditionParamRef.lastModPwdAddrNotList.size() > 0">
- ${_conditionType_} a.lastModPwdAddr not in
- <foreach collection="conditionParamRef.lastModPwdAddrNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1130,13 +933,6 @@
</foreach>
,
</if>
- <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
- field(a.siteId,
- <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- ,
- </if>
<if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
field(a.status,
<foreach collection="conditionParamRef.statusList" open="" close=")" index="index" item="item" separator=",">
@@ -1144,13 +940,6 @@
</foreach>
,
</if>
- <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
- field(a.customerId,
- <foreach collection="conditionParamRef.customerIdList" open="" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- ,
- </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
@@ -1160,10 +949,11 @@
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
- a.${item.columnName} ${item.sortKind}
+ a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
+
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
@@ -1187,13 +977,6 @@
</foreach>
,
</if>
- <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
- field(a.siteId,
- <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- ,
- </if>
<if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
field(a.status,
<foreach collection="conditionParamRef.statusList" open="" close=")" index="index" item="item" separator=",">
@@ -1201,13 +984,6 @@
</foreach>
,
</if>
- <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
- field(a.customerId,
- <foreach collection="conditionParamRef.customerIdList" open="" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- ,
- </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
@@ -1231,21 +1007,6 @@
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
- <if test="orderCol.containsKey('loginPwd1')">
- a.loginPwd1
- <if test='orderCol.loginPwd1 != null and "DESC".equalsIgnoreCase(orderCol.loginPwd1)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('loginPwd2')">
- a.loginPwd2
- <if test='orderCol.loginPwd2 != null and "DESC".equalsIgnoreCase(orderCol.loginPwd2)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('loginPwd3')">
- a.loginPwd3
- <if test='orderCol.loginPwd3 != null and "DESC".equalsIgnoreCase(orderCol.loginPwd3)'>DESC</if>
- ,
- </if>
<if test="orderCol.containsKey('loginLimitAddress')">
a.loginLimitAddress
<if test='orderCol.loginLimitAddress != null and "DESC".equalsIgnoreCase(orderCol.loginLimitAddress)'>DESC</if>
@@ -1291,9 +1052,14 @@
<if test='orderCol.userType != null and "DESC".equalsIgnoreCase(orderCol.userType)'>DESC</if>
,
</if>
- <if test="orderCol.containsKey('siteId')">
- a.siteId
- <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</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')">
@@ -1301,11 +1067,6 @@
<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>
@@ -1331,16 +1092,6 @@
<if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if>
,
</if>
- <if test="orderCol.containsKey('lastModPwdTime')">
- a.lastModPwdTime
- <if test='orderCol.lastModPwdTime != null and "DESC".equalsIgnoreCase(orderCol.lastModPwdTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('lastModPwdAddr')">
- a.lastModPwdAddr
- <if test='orderCol.lastModPwdAddr != null and "DESC".equalsIgnoreCase(orderCol.lastModPwdAddr)'>DESC</if>
- ,
- </if>
</trim>
</if>
--
2.24.3