diff --git a/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go b/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go index cd7094ef..20a8f954 100644 --- a/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go +++ b/dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonDao/BaseRolePersonDao.go @@ -3,6 +3,7 @@ package BaseRolePersonDao import ( "dsBaseRpc/Const" "dsBaseRpc/RpcService/BaseRolePerson/BaseRolePersonProto" + "dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao" "dsBaseRpc/Utils/CommonUtil" "dsBaseRpc/Utils/DbUtil" "dsBaseRpc/Utils/RedisUtil" @@ -57,6 +58,33 @@ func PageBaseRolePerson(in *BaseRolePersonProto.QueryArg) ([]map[string]interfac //分页 myBuilder.Limit(limit, offset) list, count, err := SqlKit.QueryForPk(sql) + + //判断人员的身份, 增加老师和学生的默认角色ID + identityId := SysLoginpersonDao.GetIdentityIdByPersonId(in.PersonId) + if identityId == 2 { + var _map = make(map[string]interface{}) + _map["id"] = CommonUtil.GetUUID() + _map["id_int"] = -1 + _map["role_id"] = "22222222-2222-2222-2222-222222222222" + _map["identity_id"] = 2 + _map["person_id"] = in.PersonId + _map["rule_id"] = -1 + _map["b_use"] = 1 + _map["last_updated_time"] = CommonUtil.GetCurrentTimestamp() + list = append(list, _map) + } + if identityId == 3 { + var _map = make(map[string]interface{}) + _map["id"] = CommonUtil.GetUUID() + _map["id_int"] = -1 + _map["role_id"] = "33333333-3333-3333-3333-333333333333" + _map["identity_id"] = 2 + _map["person_id"] = in.PersonId + _map["rule_id"] = -1 + _map["b_use"] = 1 + _map["last_updated_time"] = CommonUtil.GetCurrentTimestamp() + list = append(list, _map) + } return list, count, err } diff --git a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go index 8f583517..34ad4942 100644 --- a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go +++ b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go @@ -107,13 +107,13 @@ func IsValidIdEmail(tel string, excludePersonId string) bool { */ func UpdatePersonName(personId string, personName string) (int64, error) { var loginBean models.TSysLoginperson - loginBean.PersonId=personId + loginBean.PersonId = personId has, err := db.Where("person_id = ?", personId).Get(&loginBean) - if !has{ - return 0,nil + if !has { + return 0, nil } - if err!=nil{ - return 0,err + if err != nil { + return 0, err } //删除登录表的缓存 var ids = []string{loginBean.Id} @@ -341,3 +341,16 @@ func UpdatePwd(identityId int32, personId string, pwd string) (bool, error) { } return true, nil } + +/** +功能:根据人员ID获取人员的身份ID +*/ +func GetIdentityIdByPersonId(personId string) int64 { + sql := "select identity_id from t_sys_loginperson where person_id=?" + list, _ := db.SQL(sql, personId).Query().List() + if len(list) > 0 { + return list[0]["identity_id"].(int64) + } else { + return -1 + } +}