From d2a3238476695526abdf80dbf90063d1b50b4465 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 24 Jun 2020 14:09:35 +0800
Subject: [PATCH] 'commit'

---
 .../BaseOrganizationService/BaseOrganizationService.go    | 2 +-
 .../SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go | 8 ++++----
 .../SysLoginpersonBusinessService.go                      | 2 +-
 .../SysLoginpersonService/SysLoginpersonService.go        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
index 7a8637c6..83ea78a1 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
@@ -654,7 +654,7 @@ func UpdateManager(bureauId string, bUse int32) error {
 		modelLoginPerson.PersonId = personId
 		modelLoginPerson.PersonName = model.Xm
 		modelLoginPerson.BUse = 1
-		_, err = SysLoginpersonDao.AddSysLoginperson(*modelLoginPerson)
+		_, err = SysLoginpersonDao.AddSysLoginPerson(*modelLoginPerson)
 		if err != nil {
 			return err
 		}
diff --git a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go
index 6eec944c..c511e967 100644
--- a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go
+++ b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go
@@ -16,12 +16,12 @@ import (
 var db = DbUtil.Engine
 
 //增加
-func AddSysLoginperson(model models.TSysLoginperson) (int64, error) {
+func AddSysLoginPerson(model models.TSysLoginperson) (int64, error) {
 	return db.Insert(model)
 }
 
 //修改
-func UpdateSysLoginperson(model models.TSysLoginperson) (int64, error) {
+func UpdateSysLoginPerson(model models.TSysLoginperson) (int64, error) {
 	//1、清除Redis缓存
 	var ids = []string{model.Id}
 	var selector = SqlKit.GetBean("t_sys_loginperson")
@@ -90,7 +90,7 @@ func IsValidIdTel(tel string, excludePersonId string) bool {
 时间：2020-06-03
 */
 func IsValidIdEmail(tel string, excludePersonId string) bool {
-	//1、在教师表中查找
+	//在教师表中查找
 	sql := "select count(1) as c from t_base_teacher where dzxx=? and person_id<>? and b_use=1"
 	list, _ := db.SQL(sql, tel, excludePersonId).Query().List()
 	if list[0]["c"].(int64) > 0 {
@@ -112,7 +112,7 @@ func UpdatePersonName(personId string, personName string) (int64, error) {
 }
 
 //分页查询
-func PageSysLoginperson(in *SysLoginpersonProto.QueryArg) ([]map[string]interface{}, int32, error) {
+func PageSysLoginPerson(in *SysLoginpersonProto.QueryArg) ([]map[string]interface{}, int32, error) {
 	//接收传入参数
 	var limit = int(in.Limit)
 	var offset = int((in.Page - 1) * in.Limit)
diff --git a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonBusinessService.go b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonBusinessService.go
index 4f919b37..2ef2accd 100644
--- a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonBusinessService.go
+++ b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonBusinessService.go
@@ -68,7 +68,7 @@ func AddLoginperson(identityId int32, personId string, personName string) (int64
 	model.PersonId = personId
 	model.PersonName = personName
 	model.BUse = 1
-	count, err := SysLoginpersonDao.AddSysLoginperson(*model)
+	count, err := SysLoginpersonDao.AddSysLoginPerson(*model)
 	return count, err
 }
 
diff --git a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go
index 1a6484a5..f06672fa 100644
--- a/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go
+++ b/dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonService/SysLoginpersonService.go
@@ -72,7 +72,7 @@ func (s *Rpc) UpdateSysLoginperson(ctx context.Context, in *SysLoginpersonProto.
 	model := new(models.TSysLoginperson)
 	model.Id = in.LoginName
 	model.Pwd = LdapUtil.GetLdapPassword(in.Pwd) //注意这里修改的密码是加密后的密码
-	_, err := SysLoginpersonDao.UpdateSysLoginperson(*model)
+	_, err := SysLoginpersonDao.UpdateSysLoginPerson(*model)
 	//错误处理
 	if err != nil {
 		reply.Success = false
@@ -89,7 +89,7 @@ func (s *Rpc) UpdateSysLoginperson(ctx context.Context, in *SysLoginpersonProto.
 func (s *Rpc) PageSysLoginperson(ctx context.Context, in *SysLoginpersonProto.QueryArg) (*SysLoginpersonProto.Reply, error) {
 	//rpc响应
 	var reply SysLoginpersonProto.Reply
-	list, count, err := SysLoginpersonDao.PageSysLoginperson(in)
+	list, count, err := SysLoginpersonDao.PageSysLoginPerson(in)
 	//错误处理
 	if err != nil {
 		reply.Success = false
@@ -186,7 +186,7 @@ func (s *Rpc) PageSysLoginpersonExcel(ctx context.Context, in *SysLoginpersonPro
 	in.Page = 1
 	in.Limit = Const.IntMax
 
-	list, _, err := SysLoginpersonDao.PageSysLoginperson(in)
+	list, _, err := SysLoginpersonDao.PageSysLoginPerson(in)
 	//错误处理
 	if err != nil {
 		reply.Success = false