通讯录-企业列表

rpc/messagecenter/messagecenter.proto

@@ -215,6 +215,7 @@ message departmentsInfo{
   int64 id = 1;
   string departmentName = 2;
   repeated PersonInfo persons = 3;//部门下的人
+  departmentsInfo childDepartment = 4;//部门下子部门
 }
 message EntPersonListResp{
   int64         error_code = 1; //响应代码

service/ent_address_book.go

@@ -9,14 +9,14 @@ import (
 func (b ChatGroupService) EntPersonsList(param *messagecenter.EntPersonsListReq) {
 	var sql string
 	if param.Name != "" {
-		sql = "SELECT a.id,a.pid,a.name,c.id as user_id,c.name as user_name,c.phone as user_phone,c.power as user_power,e.name as role from entniche_department a " +
+		sql = "SELECT a.id as dept_id,a.pid,a.name as dept_name,c.id as user_id,c.name as user_name,c.phone as user_phone,c.power as user_power,c.mail,e.name as role from entniche_department a " +
 			"INNER JOIN entniche_department_user b on (a.ent_id=? and a.id=b.dept_id) " +
 			"INNER JOIN entniche_user c on (b.user_id=c.id and c.name like '%" + param.Name + "%') " +
 			"LEFT JOIN entniche_user_role d on (c.id=d.user_id) " +
 			"LEFT JOIN entniche_role e on (d.role_id=e.id) " +
 			"order by a.id,convert(c.name using gbk) COLLATE gbk_chinese_ci asc"
 	} else {
-		sql = `SELECT a.id,a.pid,a.name,c.id as user_id,c.name as user_name,c.phone as user_phone,c.power as user_power,e.name as role from entniche_department a 
+		sql = `SELECT a.id as dept_id,a.pid,a.name as dept_name,c.id as user_id,c.name as user_name,c.phone as user_phone,c.power as user_power,c.mail,e.name as role from entniche_department a 
 			INNER JOIN entniche_department_user b on (a.ent_id=? and a.id=b.dept_id) 
 			INNER JOIN entniche_user c on (b.user_id=c.id) 
 			LEFT JOIN entniche_user_role d on (c.id=d.user_id) 
@@ -28,7 +28,14 @@ func (b ChatGroupService) EntPersonsList(param *messagecenter.EntPersonsListReq)
 		for _, v := range *data {
 			log.Println(v)
 			//id := cm.IntAll(v["id"])
-
+			/*phone := cm.ObjToString(v["user_phone"])
+			//根据用户手机号查询用户职位
+			person := messagecenter.PersonInfo{
+				Id:         cm.Int64All(v["user_id"]),
+				PersonName: cm.ObjToString(v["user_name"]),
+				Phone:      cm.ObjToString(v["user_phone"]),
+				Email:      cm.ObjToString(v["mail"]),
+			}*/
 			/*user := map[string]interface{}{
 				"user_id":  cm.IntAll(v["user_id"]),
 				"power":    user_power,
@@ -37,7 +44,6 @@ func (b ChatGroupService) EntPersonsList(param *messagecenter.EntPersonsListReq)
 				"role":     cm.ObjToString(v["role"]),
 			}
 			//log.Println("权限：", user_power)
-
 			list = append(list, map[string]interface{}{
 				"id":    id,
 				"pid":   cm.IntAll(v["pid"]),