diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 8df2148c..7815872d 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -498,12 +498,13 @@ public class MapController extends BaseController {
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pd = this.getPageData();
         String errInfo = "success";
+        pd.put("CARDNO",pd.getString("cardNo"));
         PageData byCardNo = usersService.findByCardNo(pd);
         if (byCardNo != null) {
             pd.put("USER_ID", byCardNo.getString("USER_ID"));
             List<PageData> varList = new ArrayList<>();
             varList = usersService.findEightsByUserId(pd);
-            map.put("INFO",byCardNo);
+            map.put("info",byCardNo);
             map.put("varList", varList);
         }
         map.put("result", errInfo);
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index 45451181..b28c23b8 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -1424,7 +1424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				left join  `qa-cmt-prevention`.oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
 			left join  `qa-cmt-prevention`.sys_post p on p.POST_ID = u.POST_ID
 		where
-			u.CARDNO = #{CARDNO}
+			u.cardNo = #{CARDNO}
 	</select>
 
 	<select id="findEightsByUserId" parameterType="pd" resultType="pd">
@@ -1441,11 +1441,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '动火作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_hotwork f
+								   gf_hotwork f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '8'
-								 and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
+								 and FIND_IN_SET(#{USER_ID},WORK_USER)
 						   ) f UNION ALL
 					   SELECT
 						   f.ID,
@@ -1460,11 +1460,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '用电作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_electricity f
+								   gf_electricity f
 							   WHERE
 								   f.ISDELETE = '0'
 								 AND f.APPLY_STATUS != '5'
- 								 AND FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
+ 								 AND FIND_IN_SET(#{USER_ID},WORK_USER)
 						   ) f UNION ALL
 					   SELECT
 						   f.ID,
@@ -1479,11 +1479,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '盲板作业' WORK_TYPE,
 								   f.NAME as WORK_CONTENT
 							   FROM
-								   bus_blindboard f
+								   gf_blindboard f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '6'
-								 and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
+								 and FIND_IN_SET(#{USER_ID},WORK_USER)
 						   ) f UNION ALL
 					   SELECT
 						   f.ID,
@@ -1498,11 +1498,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '高处作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_highwork f
+								   gf_highwork f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '6'
-								 and FIND_IN_SET(#{USER_ID},PROJECT_MANAGER_IDS)
+								 and FIND_IN_SET(#{USER_ID},PROJECT_MANAGER)
 						   ) f UNION ALL
 					   SELECT
 						   f.ID,
@@ -1517,11 +1517,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '有限空间作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_confinedspace f
+								   gf_confinedspace f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '6'
-								 and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
+								 and FIND_IN_SET(#{USER_ID},WORK_USER)
 						   ) f UNION ALL
 					   SELECT
 						   f.ID,
@@ -1536,11 +1536,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '吊装作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_hoisting f
+								   gf_hoisting f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '6'
-								 and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
+								 and FIND_IN_SET(#{USER_ID},WORK_USER)
 						   ) f UNION ALL
 					   SELECT
 						   f.ID,
@@ -1555,7 +1555,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '破土作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_breakground f
+								   gf_breakground f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '6'
@@ -1573,7 +1573,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 								   '断路作业' WORK_TYPE,
 								   f.WORK_CONTENT
 							   FROM
-								   bus_cutroad f
+								   gf_cutroad f
 							   WHERE
 								   f.ISDELETE = '0'
 								 and f.APPLY_STATUS != '6'