Ver Fonte

Merge branch 'dev_v1.1.49.1_wh' of BaseService/jyMicroservices into hotfix/v1.1.49.1

王浩 há 1 ano atrás
pai
commit
9bfdace1a9
1 ficheiros alterados com 1 adições e 1 exclusões
  1. 1 1
      jyBXSubscribe/rpc/model/staffSubscribe.go

+ 1 - 1
jyBXSubscribe/rpc/model/staffSubscribe.go

@@ -67,7 +67,7 @@ func GetStaffSubscribeList(entId, entUserId int, query string, eStatus, pStatus,
 	// 当检索是否有个人订阅时,因为无法关联查询,需要提前加载员工是否有个人订阅
 	pSubscribeList := getEntPersonOrderList(entId)
 	// 加载当前企业所有企业分发数据
-	ruleIds := getEntSubscirbeList(entId, userEnt.Dept.Id, userEnt.Role_admin_system)
+	ruleIds := getEntSubscirbeList(entId, userEnt.Dept.Id, (userEnt.Role_admin_system || userEnt.Role_admin_department))
 
 	allRule := ""
 	if len(ruleIds) > 0 {