diff --git a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
index f5d1457..c3cd0b6 100644
--- a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
@@ -21,15 +21,15 @@
and t."phone" like concat('%', #{params.phonenumber}, '%')
- AND po."id" in (${params.orgAll})
+ AND po.ID in (${params.orgAll})
- AND po."id" = #{params.orgId}
+ AND po.ID = #{params.orgId}
and (
t."id_number" = #{params.keyWord} or
- bp.NAME like concat('%', #{params.keyWord}, '%') or
+ bp."name" like concat('%', #{params.keyWord}, '%') or
sr."name" = #{params.keyWord}
)
@@ -42,18 +42,18 @@
t."username" AS userName,
t."id_number" AS idNumber,
t."phone" AS phonenumber,
- CASE
- WHEN sr."type" LIKE '%3%' THEN po2."name"
- ELSE po.NAME
+ CASE
+ WHEN sr."type" LIKE '%3%' THEN po2.NAME
+ ELSE po.NAME
END AS orgName,
- sr.NAME AS roleName,
- CASE
- WHEN sr."type" LIKE '%3%' THEN bp.NAME
- WHEN sr."type" LIKE '%4%' THEN bs."sub_NAME"
- ELSE bp2."name"
+ sr."name" AS roleName,
+ CASE
+ WHEN sr."type" LIKE '%3%' THEN bp."name"
+ WHEN sr."type" LIKE '%4%' THEN bs."sub_name"
+ ELSE bp2."name"
END AS proName,
t."createTime",
- t.STATUS,
+ t."status",
t."is_push"
FROM
"ynrealname"."sys_user" t
@@ -78,15 +78,15 @@
and t."phone" like concat('%', #{params.phonenumber}, '%')
- AND po."id" in (${params.orgAll})
+ AND po.ID in (${params.orgAll})
- AND po."id" = #{params.orgId}
+ AND po.ID = #{params.orgId}
and (
t."id_number" = #{params.keyWord} or
- bp.NAME like concat('%', #{params.keyWord}, '%') or
+ bp."name" like concat('%', #{params.keyWord}, '%') or
sr."name" = #{params.keyWord}
)
diff --git a/modules/system/src/main/resources/mapper/basic/SelectMapper.xml b/modules/system/src/main/resources/mapper/basic/SelectMapper.xml
index eef2728..b3f18d2 100644
--- a/modules/system/src/main/resources/mapper/basic/SelectMapper.xml
+++ b/modules/system/src/main/resources/mapper/basic/SelectMapper.xml
@@ -43,19 +43,19 @@