Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go

@@ -101,12 +101,16 @@ func UpdateBaseOrganization(model models.TBaseOrganization, ForceUpdateFields []
 	for i := range list {
 		u := new(models.TBaseOrganization)
 		u.SortId = model.SortId + int32(i+1)
-		id := list[i]["org_id"]
+		id := list[i]["org_id"].(string)
 		_, err := session.ID(id).Update(u)
 		if err != nil {
 			session.Rollback()
 			return 0, err
 		}
+		//删除缓存
+		var ids = []string{id}
+		var selector = SqlKit.GetBean("t_base_organization")
+		SqlKit.DeleteCacheByIds(ids, selector)
 	}
 	//事务提交
 	err := session.Commit()

dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go

@@ -228,14 +228,14 @@ func GetManageArea(personId string, AreaType int32) ([]map[string]interface{}, i
 			areaIds = append(areaIds, list[i]["rule_id"].(string))
 		}
 	}
-	var myBuilder = builder.Dialect(builder.MYSQL).Select("area_code,area_name,if(substring(master_code,3,5)='0000','-1',master_code) as parent_code").
-		From("t_gov_area").Where(builder.In("area_code", areaIds))
+	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.area_code,t1.area_name,(select t2.area_name from t_gov_area as t2 where t2.area_code=t1.master_code) as parent_name,if(substring(t1.master_code,3,5)='0000','-1',t1.master_code) as parent_code").
+		From("t_gov_area as t1").Where(builder.In("t1.area_code", areaIds))
 	//只要市
 	if AreaType == 1 {
-		myBuilder.And(builder.Eq{"area_level_id": 2})
+		myBuilder.And(builder.Eq{"t1.area_level_id": 2})
 	} else //只要县区
 	{
-		myBuilder.And(builder.Eq{"area_level_id": 3})
+		myBuilder.And(builder.Eq{"t1.area_level_id": 3})
 	}
 	sql, err := myBuilder.ToBoundSQL()
 	if err != nil {

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -296,7 +296,7 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	t1.mzm,t1.zzmmm,t1.sfzjlxm,	(case t1.sfzjh when '-1' then '' else t1.sfzjh  end ) as sfzjh,
 	t1.xlm,t1.xwm,t1.zcm,t1.bzlbm,t1.stage_id,t1.subject_id,t1.gwzym,t1.lxdh,t1.dzxx
 	from t_base_teacher as t1 inner join t_base_organization as t2 on t1.org_id=t2.org_id
-	where t1.bureau_id=? and t1.identity_id=2`
+	where t1.bureau_id=? and t1.identity_id=2 and t1.b_use=1`
 		list, _ := db.SQL(sql, bureauId).Query().List()
 		for i := range list {
 			record := list[i]