Merge branch 'master' of 10.10.14.250:huanghai/dsMin

master
wubin 5 years ago
commit 7d4f777434

@ -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`
//只要市

Loading…
Cancel
Save