From 26de1f03de34150fd496b3e9ec0d78d4ad76c5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 15 Mar 2021 13:50:36 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/user2.go             | 10 ++++++++++
 business/jxstore/permission/permission.go |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index f1ad66737..ffa73ae19 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -8,6 +8,8 @@ import (
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
+
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
@@ -561,6 +563,14 @@ func AddUsers4Role(ctx *jxcontext.Context, r *authz.RoleInfo, userIDList []strin
 
 	errList := errlist.New()
 	for _, v := range userIDList {
+		if permission.IsRoledByUserID(v) {
+			if storeIDsMap, err := permission.GetUserStoresResultMap(v); err == nil {
+				if storeIDsMap[r.StoreID] == 0 {
+					return fmt.Errorf("此用户没有该门店[%v]的权限，无法添加到分组", r.StoreID)
+				}
+			}
+		}
+
 		if err = checkUserType(v, model.UserTypeNonConsumer); err != nil {
 			return err
 		}
diff --git a/business/jxstore/permission/permission.go b/business/jxstore/permission/permission.go
index ad3e16ac0..28ae73342 100644
--- a/business/jxstore/permission/permission.go
+++ b/business/jxstore/permission/permission.go
@@ -413,3 +413,12 @@ func IsRoled(ctx *jxcontext.Context) bool {
 	}
 	return false
 }
+
+func IsRoledByUserID(userID string) bool {
+	if user, err := dao.GetUserByID(dao.GetDB(), "user_id", userID); err == nil {
+		if user.Type&model.UserTypeRole != 0 {
+			return true
+		}
+	}
+	return false
+}