Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -856,7 +856,9 @@ public class DataImpl {
                 checkUser.setName(resultData.getString("name"));
                 checkUser.setPwd(StringUtil.right(checkUser.getMobile(), 8));
                 checkUser.setStatus(1);
-                checkUser.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("created_at").toString()));
+                if (null != resultData.getTimestamp("created_at")) {
+                    checkUser.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("created_at").toString()));
+                }
                 if (null != resultData.getTimestamp("updated_at")) {
                     checkUser.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("updated_at").toString()));
                 }
@@ -877,18 +879,18 @@ public class DataImpl {
                 List<CheckPerformanceRelationParam> voList = new ArrayList();
                 KylinCheckUserPerformanceVo checkUserPerformanceVo = new KylinCheckUserPerformanceVo();
                 checkUserPerformanceVo.setCheckUserId(checkUser.getCheckUserId());
-                String relationSql = "select * from performance_visit_children where performance_id > 5721 and merchant_id = = " + checkUser.getCheckUserId(); //设置的预编译语句格式
+                String relationSql = "select * from performance_visit_children where performance_id > 5721 and merchant_id = " + checkUser.getCheckUserId(); //设置的预编译语句格式
                 pstmt = con.prepareStatement(relationSql);
                 ResultSet relationData = pstmt.executeQuery();
                 while (relationData.next()) {
                     KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
-                    checkUserPerformances.setCheckUserId(resultData.getInt("merchant_id") + "");
-                    checkUserPerformances.setPerformanceId(resultData.getInt("performance_id") + "");
-                    checkUserPerformances.setCheckUserPerformanceId(resultData.getInt("id") + "");
+                    checkUserPerformances.setCheckUserId(relationData.getInt("merchant_id") + "");
+                    checkUserPerformances.setPerformanceId(relationData.getInt("performance_id") + "");
+                    checkUserPerformances.setCheckUserPerformanceId(relationData.getInt("id") + "");
                     checkUserPerformances.setStatus(1);
-                    checkUserPerformances.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("created_at").toString()));
-                    if (null != resultData.getTimestamp("updated_at")) {
-                        checkUserPerformances.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("updated_at").toString()));
+                    checkUserPerformances.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(relationData.getTimestamp("created_at").toString()));
+                    if (null != relationData.getTimestamp("updated_at")) {
+                        checkUserPerformances.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssS.parse(relationData.getTimestamp("updated_at").toString()));
                     }
                     checkUserPerformancesArrayList.add(checkUserPerformances);