xingzai 6 meses atrás
pai
commit
c809f804c0
2 arquivos alterados com 44 adições e 0 exclusões
  1. 29 0
      controllers/roadshow/calendar.go
  2. 15 0
      models/tables/admin/admin.go

+ 29 - 0
controllers/roadshow/calendar.go

@@ -74,6 +74,17 @@ func (this *CalendarController) Add() {
 	for _, v := range sysUserList {
 		raiAskadminMap[v.AdminId] = true
 	}
+
+	sysUserFwang, e := admin.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			this.FailWithMessage("用户不存在, 请检查!", "用户不存在, 请检查!")
+			return
+		}
+		this.FailWithMessage("用户不存在, 请检查!", "fwang 用户名获取用户失败!Err: "+e.Error())
+		return
+	}
+	raiAskadminMap[sysUserFwang.AdminId] = true // 手动拼接王芳到权益的策略行业下 end
 	//var tipMsg string
 	for _, v := range req.ResearcherList {
 		if v.ResearcherId <= 0 {
@@ -1702,6 +1713,24 @@ func (this *CalendarController) ResearcherList() {
 	for _, v := range listPermission {
 		mapPermissionId[v.PermissionName] = v.ChartPermissionId
 	}
+
+	sysUserFwang, e := admin.GetSysUserByAdminName("fwang") // 手动拼接王芳到权益的策略行业下 start
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			this.FailWithMessage("用户不存在, 请检查!", "用户不存在, 请检查!")
+			return
+		}
+		this.FailWithMessage("用户不存在, 请检查!", "fwang 用户名获取用户失败!Err: "+e.Error())
+		return
+	}
+	itemFwang := new(roadshow.ResearcherGroup)
+	itemFwang.AdminId = sysUserFwang.AdminId
+	itemFwang.GroupId = sysUserFwang.GroupId
+	itemFwang.GroupName = sysUserFwang.GroupName
+	itemFwang.RealName = sysUserFwang.RealName
+	itemFwang.RoleTypeCode = sysUserFwang.RoleTypeCode
+	mapPermissionUser["策略"] = append(mapPermissionUser["策略"], itemFwang) // 手动拼接王芳到权益的策略行业下 end
+
 	for _, v := range askUserList {
 		if admin, ok := adminMap[v.AdminId]; ok {
 			item := &roadshow.ResearcherGroup{

+ 15 - 0
models/tables/admin/admin.go

@@ -225,3 +225,18 @@ func GetAdminListByIdListWithoutEnable(idList []int) (items []*Admin, err error)
 	_, err = o.Raw(sql, idList).QueryRows(&items)
 	return
 }
+
+// GetSysUserByAdminName 账号获取用户
+func GetSysUserByAdminName(adminName string) (item *Admin, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+				a.*, b.role_type_code
+			FROM
+				admin AS a
+			INNER JOIN sys_role AS b ON a.role_id = b.role_id
+			WHERE
+				a.admin_name = ?
+			LIMIT 1`
+	err = o.Raw(sql, adminName).QueryRow(&item)
+	return
+}