From b7c071980e3cfda24e1c240941bb033c56603c32 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Tue, 23 Jan 2024 14:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=97=A8=E5=8F=A3?=
 =?UTF-8?q?=E9=97=A8=E7=A6=81=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E5=8D=A1=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mkmj/MkmjAreaGateController.java          | 10 +++---
 .../mkmj/MkmjGateLogController.java           | 10 +++---
 .../datasource/mkmj/MkmjGateLogMapper.xml     | 33 +++++++++++++++----
 .../mybatis/datasource/system/UsersMapper.xml |  6 ++++
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java
index 5fb3fa82..8f3d0bbe 100644
--- a/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java
+++ b/src/main/java/com/zcloud/controller/mkmj/MkmjAreaGateController.java
@@ -37,7 +37,7 @@ public class MkmjAreaGateController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/add")
-	@RequiresPermissions("mkmjAreaGate:add")
+	@RequiresPermissions("mkmjArea:add")
 	@ResponseBody
 	public ReturnMap add() throws Exception{
 		PageData pd = new PageData();
@@ -56,7 +56,7 @@ public class MkmjAreaGateController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/delete")
-	@RequiresPermissions("mkmjAreaGate:del")
+	@RequiresPermissions("mkmjArea:del")
 	@ResponseBody
 	public ReturnMap delete() throws Exception{
 		PageData pd = new PageData();
@@ -69,7 +69,7 @@ public class MkmjAreaGateController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/edit")
-	@RequiresPermissions("mkmjAreaGate:edit")
+	@RequiresPermissions("mkmjArea:edit")
 	@ResponseBody
 	public ReturnMap edit() throws Exception{
 		PageData pd = new PageData();
@@ -84,7 +84,7 @@ public class MkmjAreaGateController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/list")
-	@RequiresPermissions("mkmjAreaGate:list")
+	@RequiresPermissions("mkmjArea:list")
 	@ResponseBody
 	public Object list(Page page) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
@@ -106,7 +106,7 @@ public class MkmjAreaGateController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/goEdit")
-	@RequiresPermissions("mkmjAreaGate:edit")
+	@RequiresPermissions("mkmjArea:edit")
 	@ResponseBody
 	public Object goEdit() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java
index 56a7736f..ba8f91fc 100644
--- a/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java
+++ b/src/main/java/com/zcloud/controller/mkmj/MkmjGateLogController.java
@@ -38,7 +38,7 @@ public class MkmjGateLogController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/add")
-	@RequiresPermissions("mkmjGateLog:add")
+	@RequiresPermissions("mkmjArea:add")
 	@ResponseBody
 	public ReturnMap add() throws Exception{
 		PageData pd = new PageData();
@@ -56,7 +56,7 @@ public class MkmjGateLogController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/delete")
-	@RequiresPermissions("mkmjGateLog:del")
+	@RequiresPermissions("mkmjArea:del")
 	@ResponseBody
 	public ReturnMap delete() throws Exception{
 		PageData pd = new PageData();
@@ -69,7 +69,7 @@ public class MkmjGateLogController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/edit")
-	@RequiresPermissions("mkmjGateLog:edit")
+	@RequiresPermissions("mkmjArea:edit")
 	@ResponseBody
 	public ReturnMap edit() throws Exception{
 		PageData pd = new PageData();
@@ -84,7 +84,7 @@ public class MkmjGateLogController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/list")
-	@RequiresPermissions("mkmjGateLog:list")
+	@RequiresPermissions("mkmjArea:list")
 	@ResponseBody
 	public Object list(Page page) throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
@@ -106,7 +106,7 @@ public class MkmjGateLogController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/goEdit")
-	@RequiresPermissions("mkmjGateLog:edit")
+	@RequiresPermissions("mkmjArea:edit")
 	@ResponseBody
 	public Object goEdit() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml
index 10dfa80e..b4b17477 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjGateLogMapper.xml
@@ -18,7 +18,8 @@
 		f.AREA_GATE_ID,
 		f.STATE,
 		f.LOG_TIME,
-		f.USER_CARD,
+		f.USER_ID,
+		f.USER_NAME,
 		f.GATE_TYPE,
 		f.CREATOR,
 		f.CREATTIME,
@@ -38,7 +39,8 @@
 		AREA_GATE_ID,
 		STATE,
 		LOG_TIME,
-		USER_CARD,
+		USER_ID,
+		USER_NAME,
 		GATE_TYPE,
 		CREATOR,
 		CREATTIME,
@@ -58,7 +60,8 @@
 		#{AREA_GATE_ID},
 		#{STATE},
 		#{LOG_TIME},
-		#{USER_CARD},
+		#{USER_ID},
+		#{USER_NAME}
 		#{GATE_TYPE},
 		#{CREATOR},
 		#{CREATTIME},
@@ -131,9 +134,27 @@
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		f.AREA_LOG_ID,
+		f.AREA_GATE_ID,
+		f.STATE,
+		f.LOG_TIME,
+		IFNULL(u.NAME,f.USER_NAME) NAME,
+		f.GATE_TYPE,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE,
+		f.EX1,
+		f.EX2,
+		f.EX3,
+		f.EX4,
+		f.EX5,
+		g.GATE_NAME
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN MKMJ_AREA_GATE g on g.AREA_GATE_ID = f.AREA_GATE_ID
+		LEFT JOIN vi_user_all u on f.USER_ID = u.USER_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
@@ -145,8 +166,8 @@
 				-->
 				)
 		</if>
-		<if test="pd.AREA_GATE_ID != null and pd.AREA_GATE_ID != ''"><!-- 关键词检索 -->
-			and f.AREA_GATE_ID=#{pd.AREA_GATE_ID}
+		<if test="pd.AREA_ID != null and pd.AREA_ID != ''"><!-- 关键词检索 -->
+			and g.AREA_ID=#{pd.AREA_ID}
 		</if>
 	</select>
 
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index 514370b1..7ab21186 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		JCR,
 		CORPINFO_ID,
 		CARDNO,
+		MKMJCARD.
 		ISDELETE
 	</sql>
 	<!-- 字段 -->
@@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		f.JCR,
 		f.CORPINFO_ID,
 		f.CARDNO,
+		f.MKMJCARD,
 		f.ISDELETE
 	</sql>
 	<!-- 字段值 -->
@@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		#{JCR},
 		#{CORPINFO_ID},
 		#{CARDNO},
+		#{MKMJCARD},
 		#{ISDELETE}
 	</sql>
 
@@ -387,6 +390,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="CARDNO != null and CARDNO != ''">
 			,CARDNO				= #{CARDNO}
 		</if>
+		<if test="MKMJCARD != null and MKMJCARD != ''">
+			,MKMJCARD				= #{MKMJCARD}
+		</if>
 		<if test="DURATION != null and DURATION != ''">
 			,DURATION				= #{DURATION}
 		</if>