Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go

@@ -527,9 +527,19 @@ func ListOrgInfoByOrgKeyWord(personId string, orgKeyWord string) ([]map[string]i
 	ruleId := list[0]["rule_id"].(string)
 	//(2)构建SQL进行查询
 	var myBuilder = builder.Dialect(builder.MYSQL).Select("*").From("t_base_organization")
-	myBuilder.Where(builder.Eq{"area_code": ruleId}).
-		And(builder.Like{"org_name", orgKeyWord}).
-		And(builder.In("org_type", 1, 2, 7)).Limit(10, 0)
+
+	// 如果是超级管理员，那么没有这个条件限制
+	if ruleId != "100000" {
+		//如果是市管理员
+		if ruleId[len(ruleId)-2:] == "00" {
+			myBuilder.Where(builder.Eq{"city_code": ruleId})
+		} else {
+			//如果是县区管理员
+			myBuilder.Where(builder.Eq{"district_code": ruleId})
+		}
+	}
+	myBuilder.Where(builder.Like{"org_name", orgKeyWord})
+	myBuilder.Where(builder.In("org_type", 1, 2, 7)).Limit(10, 0)
 	sql, _ = myBuilder.ToBoundSQL()
 	list, err = db.SQL(sql).Query().List()
 	if err != nil {

dsBaseRpc/Sql/t_base_organization.sql

@@ -26,6 +26,7 @@ SELECT
     t1.`city_code` AS `city_code`,
     t1.`district_code` AS `district_code`,
     t1.`area_code` AS `area_code`,
+    t1.`manager_area_code` AS `manager_area_code`,
     DATE_FORMAT(t1.`last_updated_time`,'%Y/%m/%d %H:%i:%s') AS `last_updated_time`,
     DATE_FORMAT(t1.`create_time`,'%Y/%m/%d %H:%i:%s') AS `create_time`,
     case t1.`b_use` when -2 then 1 else 0 end AS `del_flag`

dsBaseRpc/Sql/t_base_teacher.sql

@@ -29,7 +29,7 @@ DATE_FORMAT(t1.`create_time`,'%Y/%m/%d %H:%i:%s') AS `create_time`,
 case t1.`b_use` when -2 then 1 else 0 end AS `del_flag`,
 `t_base_organization`.`main_school_type` AS `main_school_type`,
 `t_base_organization`.`xxbxlxm` AS `xxbxlxm`,
-`t_base_organization`.`szdcxlxm` AS `szdcxlxm` 
+`t_base_organization`.`szdcxlxm` AS `szdcxlxm`
 from (`t_base_teacher` as t1 inner join `t_base_teacher_org` as t2 on t1.person_id=t2.person_id and t2.b_use=1 and t2.is_main=1 join `t_base_organization` on (t2.`org_id` = `t_base_organization`.`org_id`))
 where t1.identity_id=2
 ) as t1

dsBaseRpc/Sql/t_base_teacher_org.sql

@@ -1,17 +1,17 @@
-SELECT
-	t1.`id` AS `id`,
-	t1.`id_int` AS `id_int`,
-	t1.`person_id` AS `person_id`,
-	t1.`bureau_id` AS `bureau_id`,
-	t1.`org_id` AS `org_id`,
-	t1.`province_code` AS `province_code`,
-	t1.`city_code` AS `city_code`,
-	cast( t1.`b_use` AS signed ) AS `b_use`,
-	t1.`district_code` as district_code,
-	t1.`main_school_id` as main_school_id,
-	t1.`sort_id` as sort_id,
-	t1.`is_main` as is_main,
-	case t1.`b_use` when -2 then 1 else 0 end AS `del_flag`,
-	DATE_FORMAT(t1.`last_updated_time`,'%Y/%m/%d %H:%i:%s') AS `last_updated_time`
-FROM
+SELECT
+	t1.`id` AS `id`,
+	t1.`id_int` AS `id_int`,
+	t1.`person_id` AS `person_id`,
+	t1.`bureau_id` AS `bureau_id`,
+	t1.`org_id` AS `org_id`,
+	t1.`province_code` AS `province_code`,
+	t1.`city_code` AS `city_code`,
+	cast( t1.`b_use` AS signed ) AS `b_use`,
+	t1.`district_code` as district_code,
+	t1.`main_school_id` as main_school_id,
+	t1.`sort_id` as sort_id,
+	t1.`is_main` as is_main,
+	case t1.`b_use` when -2 then 1 else 0 end AS `del_flag`,
+	DATE_FORMAT(t1.`last_updated_time`,'%Y/%m/%d %H:%i:%s') AS `last_updated_time`
+FROM
 	`t_base_teacher_org` as t1