Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonService/BaseRolePersonService.go

@@ -338,7 +338,7 @@ func (s *Rpc) CheckDataPrivilege(ctx context.Context, in *BaseRolePersonProto.Ch
 			for j := range l2 {
 				if l2[j]["city_code"].(string) != list[i]["rule_id"].(string) &&
 					l2[j]["district_code"].(string) != list[i]["rule_id"].(string) &&
-					l2[j]["bureau_ud"].(string) != list[i]["rule_id"].(string) {
+					l2[j]["bureau_id"].(string) != list[i]["rule_id"].(string) {
 					found = false
 					break
 				}

dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go

@@ -247,7 +247,7 @@ func GetBureauIdsByPersonIds(personIds []string) ([]map[string]interface{}, stri
 		return nil, Const.DataBaseActionError, errors.New("没有正确传入人员ID数组")
 	}
 	//一组人员，肯定是同一个身份ID
-	myBuilder := builder.Dialect(builder.MYSQL).Select("identity_id").From("t_sys_loginperson").
+	myBuilder := builder.Dialect(builder.MYSQL).Select("id").From("t_sys_loginperson").
 		Where(builder.Eq{"person_id": personIds[0]})
 	sql, err := myBuilder.ToBoundSQL()
 	if err != nil {
@@ -261,10 +261,14 @@ func GetBureauIdsByPersonIds(personIds []string) ([]map[string]interface{}, stri
 		return nil, "没有找到指定的人员信息!", nil
 	}
 	//身份
-	identityId := _list[0]["identity_id"].(int64)
+	identityId := int32(_list[0]["identity_id"].(float64))
 
 	var tableName string
 	switch identityId {
+	case 1:
+		//管理员
+		tableName = "t_base_teacher"
+		break
 	case 2:
 		//教师
 		tableName = "t_base_teacher"
@@ -281,7 +285,7 @@ func GetBureauIdsByPersonIds(personIds []string) ([]map[string]interface{}, stri
 		return nil, "查询到的身份ID有误!", nil
 		break
 	}
-	myBuilder = builder.Dialect(builder.MYSQL).Select("bureau_id").From(tableName).
+	myBuilder = builder.Dialect(builder.MYSQL).Select("person_id").From(tableName).
 		Where(builder.In("person_id", personIds))
 	sql, err = myBuilder.ToBoundSQL()
 	if err != nil {

dsBaseWeb/main.go

@@ -57,7 +57,7 @@ func main() {
 	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 
 	//统一认证拦截器
-	r.Use(Handler.SsoHandler())
+	//r.Use(Handler.SsoHandler())
 
 	//前台页面目录
 <<<<<<< HEAD