Merge branch 'master' of https://git.i2edu.net/i2/i2-bill-erp

internal/logic/get_erp_role_logic.go

@@ -31,12 +31,13 @@ func (l *GetErpRoleLogic) GetErpRole(in *transform.GetErpRoleReq) (*transform.Ge
 		return nil, errors.New("mobile and user_id is empty")
 	}
 	sql := `select  
-			sys_user.id user_id,GROUP_CONCAT(sys_role.code)  role
+			sys_user.id user_id,GROUP_CONCAT(sys_role.code)  role,sys_user_school.os_id sch_id
           from 
 			sys_user  
 		  LEFT JOIN 
 			sys_user_role on sys_user.id=sys_user_role.user_id  
-		  LEFT JOIN  sys_role on sys_user_role.role_id= sys_role.id   
+		  LEFT JOIN  sys_role on sys_user_role.role_id= sys_role.id
+		  LEFT JOIN  sys_user_school on  sys_user_school.user_id = sys_user.id	
 		  where 
 			sys_user_role.del_flag =0 and sys_user.status = 0 and sys_user.del_flag = 0 %s  GROUP BY sys_user.mobile`
 	var args string
@@ -57,5 +58,6 @@ func (l *GetErpRoleLogic) GetErpRole(in *transform.GetErpRoleReq) (*transform.Ge
 	}
 	user_id, _ := result[0]["user_id"].(string)
 	role, _ := result[0]["role"].(string)
-	return &transform.GetErpRoleRes{UserId: user_id, Role: role}, nil
+	sch_id, _ := result[0]["sch_id"].(int64)
+	return &transform.GetErpRoleRes{UserId: user_id, Role: role, SchId: sch_id}, nil
 }

internal/logic/get_user_logic.go

@@ -46,7 +46,7 @@ func (l *GetUserLogic) GetUser(in *transform.UserRequest) (*transform.UserRespon
 		return &transform.UserResponse{}, nil
 	}
 	var tfr transform.UserResponse
-	ext, err := l.svcCtx.ErpUtil.InRoles(user.Id, "TMKZHUGUAN", "LAMK", "TMKmanager", "TMKassistant", "NetTMKdirector", "NetTMKassistant", "LAMKM", "LATMK")
+	ext, err := l.svcCtx.ErpUtil.InRoles(user.Id, "LAMK", "LAMKM", "student/readingStudent")
 	if err != nil {
 		return &transform.UserResponse{}, err
 	} else if ext {

sqlconfig/organ_school/base_organ_school_all_select.tpl

@@ -11,5 +11,5 @@ WHERE
     sch.del_flag = 0
     and user_sch.del_flag = 0
     and onoff =98
-    and user_sch.user_id = {{.user_id}}
+    and user_sch.user_id = '{{.user_id}}'
 {{end}}

transform.proto

@@ -121,6 +121,7 @@ message BytesResp{
 message GetErpRoleRes{
   string user_id = 1;
   string  role = 2;
+  int64 sch_id = 3;
 }
 
 message GetErpRoleReq{

transformclient/transform.go

@@ -14,43 +14,43 @@ import (
 )
 
 type (
-	ExcelLogRes                  = transform.ExcelLogRes
-	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
-	DataPermissionReq            = transform.DataPermissionReq
-	OptionsetReq                 = transform.OptionsetReq
-	GetErpRoleRes                = transform.GetErpRoleRes
 	GetErpSchoolRes              = transform.GetErpSchoolRes
-	GetErpActiveReq              = transform.GetErpActiveReq
+	DataPermissionReq            = transform.DataPermissionReq
+	OrganSchool                  = transform.OrganSchool
+	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
+	Active                       = transform.Active
+	DataPermissionRes            = transform.DataPermissionRes
 	MktReq                       = transform.MktReq
+	ExcelLogReq                  = transform.ExcelLogReq
+	OptionsetRes                 = transform.OptionsetRes
 	ListOfInt                    = transform.ListOfInt
-	UserRequest                  = transform.UserRequest
-	Empty                        = transform.Empty
-	TreeNode                     = transform.TreeNode
-	OptionCode                   = transform.OptionCode
-	SchoolIdsReq                 = transform.SchoolIdsReq
 	TokenResponse                = transform.TokenResponse
-	ExcelLogReq                  = transform.ExcelLogReq
-	GetErpOrganSchPerByUserIdRes = transform.GetErpOrganSchPerByUserIdRes
-	StudentReq                   = transform.StudentReq
-	Tag                          = transform.Tag
-	MktRes                       = transform.MktRes
-	TokenRequest                 = transform.TokenRequest
+	TreeNodes                    = transform.TreeNodes
+	ResponseByte                 = transform.ResponseByte
+	CityIdsReq                   = transform.CityIdsReq
 	CityIdsRes                   = transform.CityIdsRes
 	BytesReq                     = transform.BytesReq
-	GetErpActiveRes              = transform.GetErpActiveRes
-	DataPermissionRes            = transform.DataPermissionRes
-	OptionsetRes                 = transform.OptionsetRes
+	UserRequest                  = transform.UserRequest
+	ExcelLogRes                  = transform.ExcelLogRes
+	GetErpActiveReq              = transform.GetErpActiveReq
+	MktRes                       = transform.MktRes
+	UserResponse                 = transform.UserResponse
+	SchoolIdsReq                 = transform.SchoolIdsReq
+	SchoolIdsRes                 = transform.SchoolIdsRes
 	BytesResp                    = transform.BytesResp
+	GetErpRoleRes                = transform.GetErpRoleRes
 	GetErpRoleReq                = transform.GetErpRoleReq
-	Active                       = transform.Active
 	StudentRes                   = transform.StudentRes
-	CityIdsReq                   = transform.CityIdsReq
-	OrganSchool                  = transform.OrganSchool
-	UserResponse                 = transform.UserResponse
-	TreeNodes                    = transform.TreeNodes
+	TokenRequest                 = transform.TokenRequest
+	Tag                          = transform.Tag
+	OptionsetReq                 = transform.OptionsetReq
+	OptionCode                   = transform.OptionCode
 	Options                      = transform.Options
-	ResponseByte                 = transform.ResponseByte
-	SchoolIdsRes                 = transform.SchoolIdsRes
+	TreeNode                     = transform.TreeNode
+	GetErpOrganSchPerByUserIdReq = transform.GetErpOrganSchPerByUserIdReq
+	GetErpActiveRes              = transform.GetErpActiveRes
+	StudentReq                   = transform.StudentReq
+	Empty                        = transform.Empty
 
 	Transform interface {
 		GetUser(ctx context.Context, in *UserRequest) (*UserResponse, error)