冲突解决

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -37,9 +37,7 @@
     </sql>
 
     <sql id="Home_Disaster_Info">
-        d
+        d.disaster_type
-        .
-        disaster_type
         ,d.disaster_time,d.disaster_country,
         m.organization
     </sql>
@@ -130,15 +128,18 @@
     </select>
 
     <select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
-        SELECT bu.name                AS `name`,
+        SELECT
+            g.username AS `name`,
             count(*) AS cnt,
-               'responseOrganization' AS `type`
+            'sponsorOrganization' AS `type`
-        FROM guest_manage_disaster_ref t
+        FROM
-        INNER JOIN blade_user bu ON bu.id = t.manager_id
+            disaster_info t
-        WHERE bu.name != ''
+                INNER JOIN guest_manage_disaster_ref gm ON gm.disaster_id = t.id
-	    AND t.`status` = '1'
+                INNER JOIN guest_info g ON g.id = gm.sponsor_id
+        WHERE
+             gm.`status` != 2
         GROUP BY
-            bu.name
+            gm.sponsor_id
         ORDER BY
             cnt DESC
             LIMIT 5

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml

@@ -26,6 +26,7 @@
     <update id="updatePassword">
         update blade_user t set t.password = #{password} where t.email = #{email}
     </update>
+
     <update id="updateAccount">
         update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
                                 t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
@@ -38,6 +39,7 @@
             email = #{email}
         </where>
     </select>
+
     <select id="getByUserStatisticsOne" resultType="java.lang.Integer">
         select count(di.id)
         FROM disaster_info di