'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -106,7 +106,7 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	var myBuilder = builder.Dialect(builder.MYSQL).Select(`t1.person_id,t1.identity_id,group_concat(t3.org_name) as org_name,t1.id_int,t1.xm,t1.xmpy,t1.cym,t1.xbm,t1.csrq,t1.mzm,t1.zzmmm,t1.sfzjlxm,t1.sfzjh,t1.xlm,t1.xwm,t1.zcm,t1.bzlbm,t1.cjny,t1.stage_id,t1.subject_id,t1.gwzym,t1.lxdh,t1.dzxx,t1.b_use,t1.state_id,t1.last_updated_time,t1.create_time,t2.bureau_id,t2.org_id`).
 		From("t_base_teacher as t1").
 		LeftJoin("t_base_teacher_org as t2", "t1.person_id=t2.person_id and t2.b_use=1 and t2.bureau_id='"+bureauId+"'").
-		InnerJoin("t_base_organization as t3","t2.org_id=t3.org_id").
+		InnerJoin("t_base_organization as t3", "t2.org_id=t3.org_id").
 		OrderBy("t2.sort_id")
 
 	if in.OrgId == bureauId {
@@ -1185,3 +1185,21 @@ func disableMainOrg(personIds []string) {
 		db.SQL(sql, personIds[i]).Execute()
 	}
 }
+
+/**
+功能：获取指定人员的部门名称
+作者：黄海
+时间：2020-08-12
+ */
+func GetPersonOrgName(personId string) (string, error) {
+	sql := `select group_concat(org_name) as org_name from t_base_organization where org_id in (
+		select org_id from t_base_teacher_org where person_id=? and b_use=1 order by is_main desc);`
+	list, err := db.SQL(sql, personId).Query().List()
+	if err != nil {
+		return "操作异常", err
+	}
+	if len(list) == 0 {
+		return "没有找到此人员", nil
+	}
+	return list[0]["org_name"].(string), nil
+}

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -41,6 +41,15 @@ func (s *Rpc) GetBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 		if list[0]["cjny"].(string)[0:4] == "1900" {
 			list[0]["cjny"] = ""
 		}
+		//加上org_name
+		orgName, err := BaseTeacherDao.GetPersonOrgName(in.PersonId)
+		if err != nil {
+			reply.Success = false
+			reply.Message = Const.DataBaseActionError
+			LogUtil.Error(ErrorConst.SqlQueryError, "执行GetPersonOrgName时发生严重错误："+err.Error())
+			return &reply, err
+		}
+		list[0]["org_name"] = orgName
 	}
 	//将结果序列化
 	reply.Success = true