Merge branch 'prod'

kgraph-admin/src/main/resources/application.yml

@@ -76,7 +76,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:

kgraph-admin/src/main/resources/mapper/showInfo/OfflineDataAnalysisMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectOfflineDataAnalysisById" parameterType="Long" resultMap="OfflineDataAnalysisResult">
         <include refid="selectOfflineDataAnalysisVo"/>
-        where id = #{id}
+        where oda.id = #{id}
     </select>
         
     <insert id="insertOfflineDataAnalysis" parameterType="OfflineDataAnalysis" useGeneratedKeys="true" keyProperty="id">

kgraph-graph/src/main/resources/mapper/neo4j/EntityClassRelationMapper.xml

@@ -42,11 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEntityClassRelationList" parameterType="EntityClassRelation" resultMap="EntityClassRelationResult">
         <include refid="selectEntityClassRelationVo"/>
         <where>  
-            <if test="name != null  and name != ''"> and `name` like concat('%', #{name}, '%')</if>
-            <if test="desc != null  and desc != ''"> and `desc` = #{desc}</if>
-            <if test="backGroundColor != null  and backGroundColor != ''"> and back_ground_color = #{backGroundColor}</if>
-            <if test="startId != null "> and start_id = #{startId}</if>
-            <if test="endId != null "> and end_id = #{endId}</if>
+            <if test="name != null  and name != ''"> and ecr.`name` like concat('%', #{name}, '%')</if>
+            <if test="desc != null  and desc != ''"> and ecr.`desc` = #{desc}</if>
+            <if test="backGroundColor != null  and backGroundColor != ''"> and ecr.back_ground_color = #{backGroundColor}</if>
+            <if test="startId != null "> and ecr.start_id = #{startId}</if>
+            <if test="endId != null "> and ecr.end_id = #{endId}</if>
         </where>
     </select>