Roc 1 年之前
父節點
當前提交
a5d2f35e2f
共有 2 個文件被更改,包括 17 次插入14 次删除
  1. 11 0
      controllers/data_manage/edb_classify.go
  2. 6 14
      controllers/target.go

+ 11 - 0
controllers/data_manage/edb_classify.go

@@ -711,9 +711,20 @@ func (this *EdbClassifyController) ItemsV2() {
 			}
 		}
 	}
+
+	// 是否允许添加分类
+	canOpClassify := true
+
+	// 如果不是 超管 或者 ficc管理员,那么就没有权限
+	if this.SysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && this.SysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_FICC_ADMIN {
+		canOpClassify = false
+	}
+
 	resp := new(data_manage.EdbClassifyListResp)
 	resp.AllNodes = nodeAll
 	resp.Language = language
+	resp.CanOpClassify = canOpClassify
+	
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

+ 6 - 14
controllers/target.go

@@ -550,11 +550,6 @@ func (this *TargetController) TargetAdd() {
 		return
 	}
 
-	//if tradeCode == "" {
-	//	br.Msg = "数据异常"
-	//	br.ErrMsg = "最大编码为空"
-	//	return
-	//}
 	maxTradeCode, err := utils.GetMaxTradeCode(tradeCode)
 	if err != nil {
 		br.Msg = "数据异常"
@@ -2398,13 +2393,13 @@ func (this *TargetController) TargetFrequencyList() {
 
 func sortEdbFrequency(frequencyList []string) (newFrequencyList []string) {
 	var frequencyMap1 = map[string]int{
-		"日度":  1,
-		"周度":  2,
-		"旬度":  3,
-		"月度":  4,
-		"季度":  5,
+		"日度":   1,
+		"周度":   2,
+		"旬度":   3,
+		"月度":   4,
+		"季度":   5,
 		"半年度": 6,
-		"年度":  7,
+		"年度":   7,
 	}
 
 	var frequencyMap2 = map[int]string{
@@ -3130,9 +3125,6 @@ func (this *TargetController) ImportTarget() {
 						}
 						failDatas = append(failDatas, failItem)
 						continue
-						//br.Msg = "数据异常"
-						//br.ErrMsg = "最大编码为空"
-						//return
 					}
 					maxTradeCode, err := utils.GetMaxTradeCode(tradeCode)
 					if err != nil {