From 1c85a3228dac929e34836153d7a2baf15d232fa7 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Tue, 7 Jul 2020 08:38:35 +0800
Subject: [PATCH] 'commit'

---
 .../BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go b/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go
index 219fd854..480f9987 100644
--- a/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go
+++ b/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go
@@ -196,7 +196,8 @@ func IsAdmin(personId string) (bool, error) {
 时间：2020-06-12
 */
 func HaveActiveCityList(AreaType int32) ([]map[string]interface{}, int32, error) {
-	sql := `select t1.area_code,t2.area_name,if(substring(t2.master_code,3,5)='0000','-1',t2.master_code) as parent_code
+	sql := `select t1.area_code,t2.area_name,(select t3.area_name from t_gov_area as t3 where t3.area_code=t1.master_code) as parent_name,
+			if(substring(t2.master_code,3,5)='0000','-1',t2.master_code) as parent_code
 			from t_base_organization as t1 inner join t_gov_area as t2 on t1.area_code=t2.area_code 
 			where t1.org_type=1 and t1.b_use=1`
 	//只要市