Merge remote-tracking branch 'origin/eta/2.0.0' into debug

controllers/data_manage/manual_edb.go

@@ -233,10 +233,10 @@ func (c *ManualEdbController) EdbSearch() {
 	var condition string
 	var pars []interface{}
 
-	userId := sysUser.AdminId
+	//userId := sysUser.AdminId
 	//超管账号可以查看分类下的所有频度数据
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
-		classifyIdList, err := data.GetUserManualClassifyIdList(userId)
+		classifyIdList, err := data.GetUserManualClassifyIdList(sysUser.AdminId)
 		if err != nil {
 			br.Msg = "获取分类数据失败"
 			br.Msg = "获取拥有的分类数据失败，Err:" + err.Error()
@@ -332,7 +332,7 @@ func (c *ManualEdbController) EdbList() {
 
 	//超管账号可以查看分类下的所有频度数据
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
-		classifyIdList, err := data.GetUserManualClassifyIdList(userId)
+		classifyIdList, err := data.GetUserManualClassifyIdList(sysUser.AdminId)
 		if err != nil {
 			br.Msg = "获取分类数据失败"
 			br.Msg = "获取拥有的分类数据失败，Err:" + err.Error()