From 999d8a80d9a1c1f20033c29e7e2a08951766bee8 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

---
 src/main/resources/mapper/OrganizationMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml
index f4a657d..13179b1 100644
--- a/src/main/resources/mapper/OrganizationMapper.xml
+++ b/src/main/resources/mapper/OrganizationMapper.xml
@@ -86,8 +86,9 @@
     <if test="distinct" >
       distinct
     </if>
-    <include refid="Base_Column_List" />
+    organization.*
     from organization
+    LEFT JOIN area ON organization.areacode = area.`code` 
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>

--
Gitblit v1.8.0