提交

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1040,27 +1040,33 @@ func (this *CommonApiController) GetSearchDetailCheck() {
 func (this *CommonApiController) GetNormData() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	//获取系统数据
-	normdata, _ := service.GetNormDataByOrgId(orgid)
-
-	if len(normdata) == 0 {
-		normdata, err := service.GetNormData(0)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"normdata": normdata,
-		})
-	} else {
-		normdata, err := service.GetNormDataByOrgId(orgid)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"normdata": normdata,
-		})
+	normdata, err := service.GetNormDataByOrgId(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
 	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"normdata": normdata,
+	})
+	//if len(normdata) == 0 {
+	//	normdata, err := service.GetNormData(0)
+	//	if err != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"normdata": normdata,
+	//	})
+	//} else {
+	//	normdata, err := service.GetNormDataByOrgId(orgid)
+	//	if err != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"normdata": normdata,
+	//	})
+	//}
 
 }