diff --git a/dsBaseRpc/RpcService/BasePosition/BasePositionDao/BasePositionDao.go b/dsBaseRpc/RpcService/BasePosition/BasePositionDao/BasePositionDao.go index 6fcbbf11..41c3ceb4 100644 --- a/dsBaseRpc/RpcService/BasePosition/BasePositionDao/BasePositionDao.go +++ b/dsBaseRpc/RpcService/BasePosition/BasePositionDao/BasePositionDao.go @@ -34,25 +34,28 @@ func UpdateBasePosition(model models.TBasePosition, ForceUpdateFields []string) } //获取职务所有的树形结构信息(不需要参数) -func TreeBasePosition() ([]map[string]interface{}, int32, error){ +func TreeBasePosition() ([]map[string]interface{}, int, error) { var myBuilder = builder.Dialect(builder.MYSQL).Select("*").From("t_base_position") myBuilder.Where(builder.Eq{"b_use": 1}) - myBuilder.And(builder.Eq{"t1.rxnf": in.Rxnf}) - myBuilder.And(builder.Eq{"t1.stage_id": in.StageId}) - myBuilder.And(builder.Eq{"t1.bureau_id": in.BureauId}) - //排除某个班级,用在将学生进行调整班级时的需求 - if in.RemoveClassId != "" { - myBuilder.And(builder.Neq{"t1.class_id": in.RemoveClassId}) - } + myBuilder.OrderBy("area_level") + myBuilder.OrderBy("org_type") + myBuilder.OrderBy("xxbxlxm") + myBuilder.OrderBy("sort_id") //获取拼接完成的SQL语句 - sql, err := myBuilder.OrderBy("t1.bh asc").Limit(limit, offset).ToBoundSQL() + sql, err := myBuilder.ToBoundSQL() if err != nil { return nil, 0, err } //调用多查询字段通用方法 list, err := db.SQL(sql).Query().List() + return list, len(list), err } + //根据单位ID获取职务信息 -func ListBasePositionByBureauId(in *BasePositionProto.QueryArg)([]map[string]interface{}, int32, error){ +func ListBasePositionByBureauId(in *BasePositionProto.QueryArg) ([]map[string]interface{}, int32, error) { + //1、哪个级别 + in. + //2、这个单位ID是哪个类型的org_type -} \ No newline at end of file + //3、如果是学校,那么还需要知道 xxbxlxm +} diff --git a/dsBaseRpc/RpcService/BasePosition/BasePositionService/BasePositionService.go b/dsBaseRpc/RpcService/BasePosition/BasePositionService/BasePositionService.go index 38a481cc..bafab8c3 100644 --- a/dsBaseRpc/RpcService/BasePosition/BasePositionService/BasePositionService.go +++ b/dsBaseRpc/RpcService/BasePosition/BasePositionService/BasePositionService.go @@ -137,7 +137,7 @@ func (s *Rpc) TreeBasePosition(ctx context.Context, in *BasePositionProto.QueryA LogUtil.Error(ErrorConst.SqlQueryError, "执行TreeBasePosition时发生严重错误:"+err.Error()) return &reply, err } - reply.Count = count + reply.Count = int32(count) reply.Success = true reply.Message = Const.SuccessDataBaseAction reply.List = CommonUtil.SerializeToString(list)