Merge pull request #111 from lanyulei/dev

fix: 修复无法通知角色和部门的bug.
2020-11-19 21:08:02 +08:00 · 2020-11-19 21:08:02 +08:00 · 999c8c3075
commit 999c8c3075
parent 922dfa7bc7 5165de4868
1 changed files with 16 additions and 0 deletions
--- a/pkg/service/getPrincipal.go
+++ b/pkg/service/getPrincipal.go
@ -94,6 +94,22 @@ func GetPrincipalUserInfo(stateList []interface{}, creator int) (userInfoList []
 				return
 			}
 			userInfoList = append(userInfoList, userInfoListTmp...)
+		case "role":
+			err = orm.Eloquent.Model(&system.SysUser{}).
+				Where("role_id in (?)", processorList).
+				Find(&userInfoListTmp).Error
+			if err != nil {
+				return
+			}
+			userInfoList = append(userInfoList, userInfoListTmp...)
+		case "department":
+			err = orm.Eloquent.Model(&system.SysUser{}).
+				Where("dept_id in (?)", processorList).
+				Find(&userInfoListTmp).Error
+			if err != nil {
+				return
+			}
+			userInfoList = append(userInfoList, userInfoListTmp...)
 		case "variable": // 变量
 			for _, processor := range processorList {
 				if int(processor.(float64)) == 1 {