Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx/mfyx_2.0

controllers/cygx/enter_score.go

@@ -145,7 +145,11 @@ func (this *EnterScoreController) EnterScoreDetail() {
 			}
 			item := new(cygx.EnterScorePermissionListResp)
 			item.ChartPermissionName = v.PermissionName
-			item.List = mapRaiUser[v.PermissionName]
+			if len(mapRaiUser[v.PermissionName]) == 0 {
+				item.List = make([]*cygx.EnterScoreRealNameListResp, 0)
+			} else {
+				item.List = mapRaiUser[v.PermissionName]
+			}
 			itemslistPermission = append(itemslistPermission, item)
 		}
 		resp.EnterScoreObj.ListRai = itemslistPermission
@@ -169,7 +173,11 @@ func (this *EnterScoreController) EnterScoreDetail() {
 		for _, v := range permissionFiccNameArr {
 			item := new(cygx.EnterScorePermissionListResp)
 			item.ChartPermissionName = v
-			item.List = mapFiccUser[v]
+			if len(mapFiccUser[v]) == 0 {
+				item.List = make([]*cygx.EnterScoreRealNameListResp, 0)
+			} else {
+				item.List = mapFiccUser[v]
+			}
 			itemsFicclistPermission = append(itemsFicclistPermission, item)
 		}
 		resp.EnterScoreObj.ListFicc = itemsFicclistPermission

models/system/sys_admin.go

@@ -515,7 +515,7 @@ func GetRaiAdmin() (items []*AdminItem, err error) {
 // GetFiccEnterScoreAdmin 获取Ficc需要录分的研究员
 func GetFiccEnterScoreAdmin() (items []*AdminItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT   *  FROM admin WHERE group_name  IN('宏观组','建材组','有色组','能化组')`
+	sql := `SELECT   *  FROM admin WHERE group_name  IN('宏观组','建材组','有色组','能化组')  AND enabled = 1 `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }