From bbaacafa6de6f636dedab59de48a8b677b72a75f Mon Sep 17 00:00:00 2001 From: "menghaiwen@fusen.cn" Date: Mon, 4 Mar 2024 17:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/basic.proto | 16 ++++++++++++++++ service/order.proto | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/service/basic.proto b/service/basic.proto index b1d754c..cf62f0a 100644 --- a/service/basic.proto +++ b/service/basic.proto @@ -48,4 +48,20 @@ message FsUser { string username = 4; // 用户名称 string company = 5; // 公司 string mobile = 6; // 电话号码 +} + +message LdapUser { + int64 user_id = 1; //用户id + string user_dn = 2; //用户dn + string user_name = 3; //用户名 + string email = 4; //邮箱 + string mobile = 5; //手机号 + string avatar = 6; //头像地址 + int64 employee_type = 7; //雇佣类型 1正式 2实习 3外包 + int64 gender = 8; //性别 1男 2女 3未知 + string birthday = 9; //生日 + repeated string belong_organizations = 10 ;//属于哪些部门 + repeated string manage_organizations = 11 ;//管理哪些部门 + int64 status = 12 ; //状态 1正常0离职 + int64 group_id = 13; //权限分组id } \ No newline at end of file diff --git a/service/order.proto b/service/order.proto index dde3845..c253a34 100644 --- a/service/order.proto +++ b/service/order.proto @@ -61,7 +61,7 @@ message OrderListReq{ OrderFilter filter = 1; // 筛选条件 int64 handle_type = 2; // 处理类型：0=原数据，1=返回处理数据 int64 channle_type = 3; // 处理类型：0=后台，1=前台 - repeated int64 related = 4; // 关联数据：1=用户信息，2=支付记录 + repeated int64 related = 4; // 关联数据：1=用户信息，2=支付记录，3=销售信息，4=设计信息，5=供应链信息 bool select_whole = 100; // 查询类型：false=分页 true=全部数据 @@ -100,6 +100,13 @@ message OrderInfo { OrderDetailDb order_detail_db = 1; // 原数据 bytes order_detail = 2; // 处理后数据 basic.FsUser user_info = 3; // 用户数据 + basic.LdapUser sale_info = 4; // 销售负责人 + basic.LdapUser design_info = 5; // 设计负责人 + OrderScm scm_info = 6; +} +message OrderScm { + repeated basic.LdapUser scm_info = 1; // 供应链信息 + repeated int64 scm_ids = 2; // 供应链信息 } /* 数据库 */