修改巡检弹窗bug

AmosBankPatrolCommon/src/main/java/com/yeejoin/amos/patrol/common/core/response/PointCheckInfoBusinessRespone.java

@@ -26,6 +26,9 @@ public class PointCheckInfoBusinessRespone {
     
     
     private String userName;
+    
+    
+    private String checkUser;
     /**
      * 检查项
      */
@@ -101,7 +104,13 @@ public class PointCheckInfoBusinessRespone {
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
+
+	public String getCheckUser() {
+		return checkUser;
+	}
+
+	public void setCheckUser(String checkUser) {
+		this.checkUser = checkUser;
+	}
 	
-	
-    
 }

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/service/impl/Safety3DDataSendServiceImpl.java

@@ -216,8 +216,9 @@ public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService {
         PointCheckInfoBusinessRespone pb = checkMapper.getCheckInfoBusinessById(checkId);
         
         AgencyUserModel userById = remoteSecurityService.getUserById(toke, product, appKey, pb.getUserId());
-        if(!StringUtils.isEmpty(userById.getUserName())) {
-        	pb.setUserName(userById.getUserName());
+        if(null != userById && !StringUtils.isEmpty(userById.getUserName())) {
+        	pb.setUserName(userById.getRealName());
+        	pb.setCheckUser(userById.getRealName());
         }
 //        //获取到推送点的状态
 //        Point point = iPointDao.findOne(pb.getId());

AmosBankPatrolStart/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1823,7 +1823,7 @@
         <result property="id" column="pointId"/>
         <result property="name" column="pointName"/>
         <result property="nodeState" column="status"/>
-        <result property="userId" column="user_id"/>
+        <result property="userId" column="userId"/>
         <collection property="pointInputitems"
                     ofType="com.yeejoin.amos.patrol.common.core.response.CheckInputBusinessResponse"
                     select="queryPointInputBu" column="{checkId=checkId}">