Browse Source

修改utils.IsErrNoRow(err)

xyxie 4 weeks ago
parent
commit
4a09d3fc4f
100 changed files with 823 additions and 837 deletions
  1. 3 3
      controllers/ai/ai.go
  2. 3 3
      controllers/ai/ai_file.go
  3. 4 4
      controllers/ai/ai_pormpt.go
  4. 17 17
      controllers/ai/ai_summary.go
  5. 2 2
      controllers/base_auth.go
  6. 7 7
      controllers/bi_dashboard.go
  7. 1 1
      controllers/classify.go
  8. 2 2
      controllers/commodity_trade_base_index.go
  9. 2 2
      controllers/data_manage/ai_predict_model/classify.go
  10. 1 1
      controllers/data_manage/ai_predict_model/framework.go
  11. 5 5
      controllers/data_manage/baiinfo_data.go
  12. 1 1
      controllers/data_manage/base_from_ly_index_controller.go
  13. 1 1
      controllers/data_manage/base_from_rzd_index_controller.go
  14. 2 2
      controllers/data_manage/business_data.go
  15. 1 1
      controllers/data_manage/ccf_data.go
  16. 23 23
      controllers/data_manage/chart_classify.go
  17. 1 1
      controllers/data_manage/chart_common.go
  18. 2 2
      controllers/data_manage/chart_edb_config.go
  19. 1 1
      controllers/data_manage/chart_framework.go
  20. 34 34
      controllers/data_manage/chart_info.go
  21. 4 4
      controllers/data_manage/chart_theme.go
  22. 8 8
      controllers/data_manage/clarksons_data.go
  23. 5 5
      controllers/data_manage/com_trade.go
  24. 10 10
      controllers/data_manage/correlation/correlation_chart_classify.go
  25. 21 21
      controllers/data_manage/correlation/correlation_chart_info.go
  26. 21 21
      controllers/data_manage/cross_variety/chart_info.go
  27. 10 10
      controllers/data_manage/cross_variety/classify.go
  28. 3 3
      controllers/data_manage/cross_variety/tag.go
  29. 3 3
      controllers/data_manage/cross_variety/variety.go
  30. 18 18
      controllers/data_manage/edb_classify.go
  31. 101 103
      controllers/data_manage/edb_info.go
  32. 6 6
      controllers/data_manage/edb_info_calculate.go
  33. 9 9
      controllers/data_manage/edb_info_refresh.go
  34. 8 8
      controllers/data_manage/edb_info_relation.go
  35. 2 2
      controllers/data_manage/eia_steo.go
  36. 6 6
      controllers/data_manage/excel/balance_table.go
  37. 7 7
      controllers/data_manage/excel/custom_analysis.go
  38. 1 1
      controllers/data_manage/excel/custom_analysis_edb.go
  39. 13 13
      controllers/data_manage/excel/excel_classify.go
  40. 13 13
      controllers/data_manage/excel/excel_info.go
  41. 1 1
      controllers/data_manage/fenwei_data.go
  42. 12 12
      controllers/data_manage/future_good/future_good_chart_classify.go
  43. 36 36
      controllers/data_manage/future_good/future_good_chart_info.go
  44. 6 6
      controllers/data_manage/future_good/future_good_edb_info.go
  45. 7 7
      controllers/data_manage/future_good/future_good_profit_chart_info.go
  46. 5 5
      controllers/data_manage/gpr_risk_data.go
  47. 12 12
      controllers/data_manage/line_equation/line_chart_classify.go
  48. 21 21
      controllers/data_manage/line_equation/line_chart_info.go
  49. 29 29
      controllers/data_manage/line_feature/chart_info.go
  50. 12 12
      controllers/data_manage/line_feature/classify.go
  51. 6 6
      controllers/data_manage/manual.go
  52. 8 8
      controllers/data_manage/multiple_graph_config.go
  53. 32 32
      controllers/data_manage/my_chart.go
  54. 6 6
      controllers/data_manage/mysteel_chemical_data.go
  55. 3 3
      controllers/data_manage/predict_edb_classify.go
  56. 14 14
      controllers/data_manage/predict_edb_info.go
  57. 10 10
      controllers/data_manage/range_analysis/chart_classify.go
  58. 17 17
      controllers/data_manage/range_analysis/chart_info.go
  59. 5 5
      controllers/data_manage/sci_data.go
  60. 7 7
      controllers/data_manage/sci_hq_data.go
  61. 4 4
      controllers/data_manage/smm_data.go
  62. 6 6
      controllers/data_manage/supply_analysis/variety.go
  63. 6 6
      controllers/data_manage/supply_analysis/variety_edb.go
  64. 8 8
      controllers/data_manage/supply_analysis/variety_plant.go
  65. 6 6
      controllers/data_manage/usda_fas_data.go
  66. 4 4
      controllers/data_manage/wind_data.go
  67. 6 6
      controllers/data_manage/yongyi_data.go
  68. 1 2
      controllers/data_source/sci99.go
  69. 6 6
      controllers/data_stat/edb_source_stat.go
  70. 1 1
      controllers/document_manage/document_manage_controller.go
  71. 5 5
      controllers/english_report/english_classify.go
  72. 5 5
      controllers/english_report/english_video.go
  73. 1 1
      controllers/english_report/policy_report.go
  74. 4 4
      controllers/english_report/report.go
  75. 8 10
      controllers/hisugar_data.go
  76. 15 15
      controllers/material/material.go
  77. 2 5
      controllers/meeting_probabilities.go
  78. 2 5
      controllers/oilchem_data.go
  79. 2 2
      controllers/out_link.go
  80. 5 5
      controllers/ppt_english.go
  81. 5 5
      controllers/ppt_v2.go
  82. 3 3
      controllers/report.go
  83. 9 9
      controllers/report_author.go
  84. 1 2
      controllers/report_chapter.go
  85. 1 1
      controllers/report_chapter_type.go
  86. 2 2
      controllers/report_v2.go
  87. 21 23
      controllers/sandbox/sandbox.go
  88. 1 1
      controllers/semantic_analysis/sa_compare.go
  89. 10 10
      controllers/sys_admin.go
  90. 1 1
      controllers/sys_department.go
  91. 1 1
      controllers/sys_group.go
  92. 1 1
      controllers/sys_menu.go
  93. 1 1
      controllers/sys_menu_button.go
  94. 2 2
      controllers/sys_role.go
  95. 2 2
      controllers/sys_role_admin.go
  96. 1 1
      controllers/sys_team.go
  97. 1 1
      controllers/sys_user.go
  98. 13 13
      controllers/target.go
  99. 12 12
      controllers/trade_analysis/warehouse.go
  100. 7 7
      controllers/trade_analysis/warehouse_classify.go

+ 3 - 3
controllers/ai/ai.go

@@ -71,7 +71,7 @@ func (this *AiController) List() {
 	//根据提问,获取信息
 	askUuid := utils.MD5(req.Ask)
 	chatMode, err := aimod.GetAiChatByAsk(askUuid)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败!"
 		br.ErrMsg = "获取数据失败,GetAiChatByAsk,Err:" + err.Error()
 		return
@@ -88,7 +88,7 @@ func (this *AiController) List() {
 		//获取主题下的所有信息
 		//AiChatTopicId
 		historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取主题历史数据失败!"
 			br.ErrMsg = "获取主题历史数据失败,Err:" + err.Error()
 			return
@@ -317,7 +317,7 @@ func (this *AiController) TopicEdit() {
 		return
 	}
 	topic, err := aimod.GetAiChatTopicByTopicName(req.TopicName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "编辑失败!"
 		br.ErrMsg = "获取数据失败!Err:" + err.Error()
 		return

+ 3 - 3
controllers/ai/ai_file.go

@@ -110,7 +110,7 @@ func (this *AiFileController) FileUpload() {
 		aiChatTopicObj.AiChatTopicId = aiChatTopicId
 		topic, err := aiChatTopicObj.GetAiChatTopicById()
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "获取数据失败!"
 				br.ErrMsg = "获取数据失败,主题不存在,Err:" + err.Error()
 				return
@@ -283,7 +283,7 @@ func (this *AiFileController) FileRetrieve() {
 		aiChatTopicObj.AiChatTopicId = req.AiChatTopicId
 		topic, err := aiChatTopicObj.GetAiChatTopicById()
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "获取数据失败!"
 				br.ErrMsg = "获取数据失败,主题不存在,Err:" + err.Error()
 				return
@@ -301,7 +301,7 @@ func (this *AiFileController) FileRetrieve() {
 	//获取主题下的所有信息
 	//AiChatTopicId
 	historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取主题历史数据失败!"
 		br.ErrMsg = "获取主题历史数据失败,Err:" + err.Error()
 		return

+ 4 - 4
controllers/ai/ai_pormpt.go

@@ -302,7 +302,7 @@ func (this *AiController) MoveAiPrompt() {
 
 	prompt, err := ai_summary.GetAiPromptById(req.AiPromptId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "当前提示词不存在"
 			br.ErrMsg = "当前提示词不存在"
 			return
@@ -321,7 +321,7 @@ func (this *AiController) MoveAiPrompt() {
 	if req.PrevAiPromptId > 0 {
 		prevPrompt, err = ai_summary.GetAiPromptById(req.PrevAiPromptId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				err = errors.New("目录下的提示词不存在")
 				return
 			}
@@ -334,7 +334,7 @@ func (this *AiController) MoveAiPrompt() {
 	if req.NextAiPromptId > 0 {
 		nextPrompt, err = ai_summary.GetAiPromptById(req.NextAiPromptId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				err = errors.New("目录下的提示词不存在")
 				return
 			}
@@ -410,4 +410,4 @@ func (this *AiController) SharePrompt() {
 	br.Msg = "操作成功"
 
 	return
-}
+}

+ 17 - 17
controllers/ai/ai_summary.go

@@ -58,7 +58,7 @@ func (this *AiController) AiSummaryClassifyItems() {
 	}
 
 	rootList, err := ai_summary.GetAiSummaryClassifyAndInfoByParentId(aiSummaryClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -68,7 +68,7 @@ func (this *AiController) AiSummaryClassifyItems() {
 	}
 
 	classifyAll, err := ai_summary.GetAiSummaryClassifyAndInfoByParentId(aiSummaryClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -243,7 +243,7 @@ func (this *AiController) DeleteSandboxClassifyCheck() {
 
 	if deleteStatus != 1 {
 		classifyCount, err := ai_summary.GetAiSummaryInfoCountByClassifyId(req.AiSummaryClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有沙盘失败,Err:" + err.Error()
 			return
@@ -304,7 +304,7 @@ func (this *AiController) DeleteAiSummaryClassify() {
 	if req.AiSummaryClassifyId > 0 && req.AiSummaryId == 0 {
 		//判断是否含有纪要
 		count, err := ai_summary.GetAiSummaryInfoCountByClassifyId(req.AiSummaryClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -328,7 +328,7 @@ func (this *AiController) DeleteAiSummaryClassify() {
 	if req.AiSummaryId > 0 {
 		summaryInfo, err := ai_summary.GetAiSummaryById(req.AiSummaryId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "纪要已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -581,7 +581,7 @@ func (this *AiController) AiSummaryClassifyMove() {
 		} else {
 			// prevId为0,也就是沙盘移到最前端
 			firstClassify, err := ai_summary.GetFirstAiSummaryByClassifyId(req.AiSummaryClassifyId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 				return
@@ -770,7 +770,7 @@ func (this *AiController) AiSummaryClassifyMove() {
 
 		} else {
 			firstClassify, err := ai_summary.GetFirstAiSummaryClassifyByParentId(aiSummaryClassifyInfo.ParentId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 				return
@@ -849,7 +849,7 @@ func (this *AiController) AiSummaryList() {
 
 	if aiSummaryClassifyId > 0 {
 		sandboxClassifyIds, err := ai_summary.GetAiSummaryClassify(aiSummaryClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -870,7 +870,7 @@ func (this *AiController) AiSummaryList() {
 
 	//获取图表信息
 	list, err := ai_summary.GetAiSummaryListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取纪要信息失败"
 		br.ErrMsg = "获取纪要信息失败,Err:" + err.Error()
@@ -887,7 +887,7 @@ func (this *AiController) AiSummaryList() {
 		list[i].ParentIds = ids
 	}
 	resp := new(ai_summary.AiSummaryListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*ai_summary.AiSummaryItems, 0)
 		resp.Paging = page
 		resp.List = items
@@ -898,7 +898,7 @@ func (this *AiController) AiSummaryList() {
 	}
 
 	dataCount, err := ai_summary.GetAiSummaryListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -934,7 +934,7 @@ func (this *AiController) AiSummaryDetail() {
 	aiSummaryId, _ := this.GetInt("AiSummaryId")
 
 	detail, err := ai_summary.GetAiSummaryItemById(aiSummaryId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取沙盘信息失败"
 		br.ErrMsg = "获取沙盘信息失败,Err:" + err.Error()
@@ -1137,7 +1137,7 @@ func (this *AiController) GenerateAiSummary() {
 		//获取主题下的所有信息
 		//AiChatTopicId
 		historyList, err := aimod.GetAiChatList(req.AiChatTopicId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取主题历史数据失败!"
 			br.ErrMsg = "获取主题历史数据失败,Err:" + err.Error()
 			return
@@ -1225,7 +1225,7 @@ func (this *AiController) GenerateAiSummary() {
 			aiChatTopicObj.AiChatTopicId = req.AiChatTopicId
 			topic, err := aiChatTopicObj.GetAiChatTopicById()
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "获取数据失败!"
 					br.ErrMsg = "获取数据失败,主题不存在,Err:" + err.Error()
 					return
@@ -1461,7 +1461,7 @@ func (this *AiController) GenerateAiSummary() {
 //		aiChatTopicObj.AiChatTopicId = aiChatTopicId
 //		topic, err := aiChatTopicObj.GetAiChatTopicById()
 //		if err != nil {
-//			if err.Error() == utils.ErrNoRow() {
+//			if utils.IsErrNoRow(err) {
 //				br.Msg = "获取数据失败!"
 //				br.ErrMsg = "获取数据失败,主题不存在,Err:" + err.Error()
 //				return
@@ -1585,14 +1585,14 @@ func (this *AiController) AiSummaryClassifyList() {
 	resp := new(ai_summary.AiSummaryClassifyListResp)
 
 	rootList, err := ai_summary.GetAiSummaryClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := ai_summary.GetAiSummaryClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 2 - 2
controllers/base_auth.go

@@ -119,7 +119,7 @@ func (c *BaseAuthController) Prepare() {
 
 			session, err := system.GetSysSessionByToken(token)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					c.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "Token 信息已变更:Token: " + token}, false, false)
 					c.StopRun()
 					return
@@ -148,7 +148,7 @@ func (c *BaseAuthController) Prepare() {
 			}
 			admin, err := system.GetSysUserById(session.SysUserId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					c.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.SysUserId)}, false, false)
 					c.StopRun()
 					return

+ 7 - 7
controllers/bi_dashboard.go

@@ -70,7 +70,7 @@ func (this *BIDaShboardController) AddDashboard() {
 		return
 	}
 	nameItem, err := bi_dashboard.GetDashboardByName(req.BiDashboardName, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "查询失败"
 		br.ErrMsg = "查询失败,Err:" + err.Error()
 		return
@@ -151,7 +151,7 @@ func (this *BIDaShboardController) EditDashboard() {
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
 	}
-	
+
 	// 修改
 	item.BiDashboardName = req.BiDashboardName
 	item.ModifyTime = time.Now()
@@ -728,7 +728,7 @@ func (this *BIDaShboardController) EditDashboardClassify() {
 		return
 	}
 	item, err := bi_dashboard.GetBiDashboardClassifyById(req.BiDashboardClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -1035,7 +1035,7 @@ func (this *BIDaShboardController) PublicCancel() {
 	}
 
 	item, err := bi_dashboard.GetDashboardById(req.BiDashboardId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -1069,7 +1069,7 @@ func (this *BIDaShboardController) HomePage() {
 	}()
 
 	item, err := bi_dashboard.GetBiDashboardHomePageById(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "数据不存在"
 		br.ErrMsg = "数据不存在,Err:" + err.Error()
 		return
@@ -1127,7 +1127,7 @@ func (this *BIDaShboardController) HomePageSave() {
 	}
 
 	item, err := bi_dashboard.GetBiDashboardHomePageById(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "首页看板查询失败"
 		br.ErrMsg = "首页看板查询失败,Err:" + err.Error()
 		return
@@ -1257,7 +1257,7 @@ func (this *BIDaShboardController) ChartExcelPermission() {
 	//共享客户组下的用户
 	shareSellerMap := make(map[int]bool, 0)
 	subAdmins, err := system.GetAdminByGroupId(groupId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取销售失败"
 		br.ErrMsg = "获取销售失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/classify.go

@@ -766,7 +766,7 @@ func (this *ClassifyController) SetEnabled() {
 	}
 	item, err := models.GetClassifyById(req.ClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}

+ 2 - 2
controllers/commodity_trade_base_index.go

@@ -2639,7 +2639,7 @@ func (this *TradeCommonController) MtjhData() {
 		product.CreateTime = v.CreateTime
 
 		modifyTime, err := data_manage.GetMtjhIndexLatestDate(v.IndexCode)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取更新时间失败"
 			br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
 			return
@@ -2741,7 +2741,7 @@ func (this *TradeCommonController) MtjhSingleData() {
 	}
 
 	modifyTime, err := data_manage.GetMtjhIndexLatestDate(indexCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取更新时间失败"
 		br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
 		return

+ 2 - 2
controllers/data_manage/ai_predict_model/classify.go

@@ -359,7 +359,7 @@ func (this *AiPredictModelClassifyController) RemoveCheck() {
 
 	if deleteStatus != 1 && req.IndexId == 0 {
 		classifyCount, err := aiPredictModel.GetAiPredictModelClassifyCountByClassifyId(req.ClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -411,7 +411,7 @@ func (this *AiPredictModelClassifyController) Remove() {
 	// 删除分类
 	if req.ClassifyId > 0 && req.IndexId == 0 {
 		count, err := aiPredictModel.GetAiPredictModelIndexCountByClassifyId(req.ClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return

+ 1 - 1
controllers/data_manage/ai_predict_model/framework.go

@@ -538,7 +538,7 @@ func (c *AiPredictModelFrameworkController) Move() {
 		updateCols = append(updateCols, "Sort", "ModifyTime")
 	} else {
 		first, err := aiPredictModel.GetFirstAiPredictModelFramework()
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "操作失败"
 			br.ErrMsg = "获取我的模型框架排首位的数据失败, Err:" + err.Error()
 			return

+ 5 - 5
controllers/data_manage/baiinfo_data.go

@@ -36,14 +36,14 @@ func (this *EdbInfoController) BaiinfoClassify() {
 	}
 
 	rootList, err := data_manage.GetBaseFromBaiinfoClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromBaiinfoClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -52,7 +52,7 @@ func (this *EdbInfoController) BaiinfoClassify() {
 	baseFromBaiinfoIndexMap := make(map[int][]*data_manage.BaseFromBaiinfoClassifyItems)
 
 	allBaseFromBaiinfoIndex, err := data_manage.GetBaiinfoIndexAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -144,14 +144,14 @@ func (this *EdbInfoController) BaiinfoClassifyName() {
 	}
 
 	rootList, err := data_manage.GetBaseFromBaiinfoClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromBaiinfoClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/data_manage/base_from_ly_index_controller.go

@@ -459,7 +459,7 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 
 			var lyDataList []*data_manage.BaseFromLyData
 			lyDataList, err = data_manage.GetBaseFromLyDataByIndexCode(v.IndexCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.ErrMsg = "GetBaseFromLyDataByIndexCode,Err:" + err.Error()
 				br.Msg = "获取数据失败"
 				return

+ 1 - 1
controllers/data_manage/base_from_rzd_index_controller.go

@@ -580,7 +580,7 @@ func (this *BaseFromRzdIndexController) RzdIndexDataExport() {
 
 			var dataList []*data_manage.BaseFromRzdData
 			dataList, err = data_manage.GetBaseFormRzdDataByIndexCode(v.IndexCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.ErrMsg = "GetBaseFormRzdDataByIndexCode,Err:" + err.Error()
 				br.Msg = "获取数据失败"
 				return

+ 2 - 2
controllers/data_manage/business_data.go

@@ -38,7 +38,7 @@ func (c *EdbBusinessController) SourceList() {
 
 	obj := data_manage.EdbBusinessSource{}
 	list, err := obj.GetAllList()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -600,7 +600,7 @@ func (c *EdbBusinessController) DataList() {
 
 	// 获取分页数据
 	dataCount, dataList, err := data.GetPageBaseBusinessIndexData(req.IndexCode, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/data_manage/ccf_data.go

@@ -1075,7 +1075,7 @@ func (this *EdbInfoController) CCFIndexNameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_CCF, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 			return

+ 23 - 23
controllers/data_manage/chart_classify.go

@@ -76,7 +76,7 @@ func (this *ChartClassifyController) ChartClassifyListV2() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -129,21 +129,21 @@ func (this *ChartClassifyController) ChartClassifyListV2() {
 	}
 
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_DEFAULT)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetChartClassifyAll(utils.CHART_SOURCE_DEFAULT)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoAll([]int{utils.CHART_SOURCE_DEFAULT})
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -202,19 +202,19 @@ func (this *ChartClassifyController) ChartClassifyListV2() {
 // getChartClassifyListForMe 获取我创建的图表
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_DEFAULT)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	classifyAll, err := data_manage.GetChartClassifyAll(utils.CHART_SOURCE_DEFAULT)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_DEFAULT}, adminInfo.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -503,7 +503,7 @@ func (this *ChartClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -590,7 +590,7 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -614,7 +614,7 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -704,7 +704,7 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -724,14 +724,14 @@ func (this *ChartClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return
@@ -806,7 +806,7 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 	//判断分类是否存在
 	chartClassifyInfo, err := data_manage.GetChartClassifyById(req.ClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在,请刷新页面"
 			return
 		}
@@ -906,7 +906,7 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartClassifyByParentId(chartClassifyInfo.ParentId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -940,13 +940,13 @@ func (this *ChartClassifyController) ChartClassifyMove() {
 // getChartClassifyListForMe 获取我创建的图表分类
 func getChartClassifyListForMeV2(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_DEFAULT)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	classifyAll, err := data_manage.GetChartClassifyAll(utils.CHART_SOURCE_DEFAULT)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -1005,7 +1005,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1018,7 +1018,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 	isShowMe, _ := this.GetBool("IsShowMe")
 	if isShowMe {
 		allChartInfo, err := data_manage.GetChartInfoByAdminIdAndClassify([]int{utils.CHART_SOURCE_DEFAULT}, sysUser.AdminId, chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取全部数据失败,Err:" + err.Error()
 			return
@@ -1036,7 +1036,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV2() {
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoAllByClassifyId(utils.CHART_SOURCE_DEFAULT, chartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -1095,7 +1095,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV3() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1108,7 +1108,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV3() {
 	isShowMe, _ := this.GetBool("IsShowMe")
 	if isShowMe {
 		allChartInfo, err := data_manage.GetChartClassifyAndInfoByParentIdForMe(chartClassifyId, sysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -1132,7 +1132,7 @@ func (this *ChartClassifyController) ChartClassifyChartListV3() {
 	}
 
 	allChartInfo, err := data_manage.GetChartClassifyAndInfoByParentId(chartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/data_manage/chart_common.go

@@ -54,7 +54,7 @@ func (this *ChartInfoController) CommonChartInfoDetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"

+ 2 - 2
controllers/data_manage/chart_edb_config.go

@@ -148,7 +148,7 @@ func (this *EdbInfoController) ModifyNoPermissionAdmin() {
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
 		br.Msg = "修改失败"
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "找不到该指标"
 			br.IsSendEmail = false
 		}
@@ -208,7 +208,7 @@ func (this *EdbInfoController) DelNoPermissionAdmin() {
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
 		br.Msg = "删除失败"
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "找不到该指标"
 			br.IsSendEmail = false
 		}

+ 1 - 1
controllers/data_manage/chart_framework.go

@@ -720,7 +720,7 @@ func (this *ChartFrameworkController) Move() {
 		updateCols = append(updateCols, "Sort", "ModifyTime")
 	} else {
 		first, err := data_manage.GetFirstChartFramework(sysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "操作失败"
 			br.ErrMsg = "获取我的图库框架排首位的数据失败, Err:" + err.Error()
 			return

+ 34 - 34
controllers/data_manage/chart_info.go

@@ -66,7 +66,7 @@ func (this *ChartInfoController) ChartInfoSave() {
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面!"
 			br.ErrMsg = "图表已被删除,请刷新页面,ChartInfoId:" + strconv.Itoa(req.ChartInfoId)
 			return
@@ -334,7 +334,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -357,7 +357,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 		edbInfoId := v.EdbInfoId
 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表不存在!"
 				br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoId)
 				return
@@ -389,7 +389,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 
 			edbExist, err := data_manage.GetEdbInfoByCondition(edbCondition, edbPars)
 			if err != nil {
-				if err.Error() != utils.ErrNoRow() {
+				if !utils.IsErrNoRow(err) {
 					br.Msg = "判断英文指标名称是否存在失败"
 					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
 					return
@@ -418,7 +418,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return
@@ -447,7 +447,7 @@ func (this *ChartInfoController) ChartEnInfoEdit() {
 		edbInfoId := v.EdbInfoId
 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表不存在!"
 				br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoId)
 				return
@@ -526,7 +526,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -549,7 +549,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 		edbInfoId := v.EdbInfoId
 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表不存在!"
 				br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoId)
 				return
@@ -584,7 +584,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 
 			edbExist, err := data_manage.GetEdbInfoByCondition(edbCondition, edbPars)
 			if err != nil {
-				if err.Error() != utils.ErrNoRow() {
+				if !utils.IsErrNoRow(err) {
 					br.Msg = "判断英文指标名称是否存在失败"
 					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
 					return
@@ -616,7 +616,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return
@@ -645,7 +645,7 @@ func (this *ChartInfoController) ChartInfoBaseEdit() {
 		edbInfoId := v.EdbInfoId
 		edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表不存在!"
 				br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoId)
 				return
@@ -698,7 +698,7 @@ func (this *ChartInfoController) ChartInfoNewest() {
 		this.ServeJSON()
 	}()
 	item, err := data_manage.GetChartInfoByNewest(1)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取最新图表失败"
 		br.ErrMsg = "获取最新图表失败,Err:" + err.Error()
 		return
@@ -786,7 +786,7 @@ func (this *ChartInfoController) ChartInfoMove() {
 	if chartInfo.ChartClassifyId != req.ChartClassifyId {
 		//查询需要修改的分类下是否存在同一个图表名称
 		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
@@ -845,7 +845,7 @@ func (this *ChartInfoController) ChartInfoMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -959,7 +959,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	if chartInfoId > 0 {
 		chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "该图表已删除,自动查看下一图表"
 				br.ErrMsg = "该图表已删除,自动查看下一图表,Err:" + err.Error()
 				br.Ret = 406
@@ -1139,7 +1139,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -1521,7 +1521,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 	}
 	chartInfo, err := data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该图表已删除,自动查看下一图表"
 			br.ErrMsg = "该图表已删除,自动查看下一图表,Err:" + err.Error()
 			br.Ret = 406
@@ -1683,7 +1683,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -2116,7 +2116,7 @@ func (this *ChartInfoController) ChartInfoSearch() {
 	for _, v := range keyWordArr {
 		v = strings.Replace(v, " ", "%", -1)
 		newSearchList, err := data_manage.ChartInfoSearchByKeyWord(v, showSysId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -2236,7 +2236,7 @@ func (this *ChartInfoController) ChartInfoSearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -2253,7 +2253,7 @@ func (this *ChartInfoController) ChartInfoSearchByEs() {
 		isEs = true
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, []int{utils.CHART_SOURCE_DEFAULT}, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -2407,7 +2407,7 @@ func (this *EdbInfoController) ChartInfoRefresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -2526,7 +2526,7 @@ func (this *ChartInfoController) ChartInfoDetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -2596,7 +2596,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -3109,7 +3109,7 @@ func (this *ChartInfoController) CopyChartInfo() {
 	}
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -4084,7 +4084,7 @@ func (this *ChartInfoController) ChartInfoConvertDetail() {
 	if chartInfoId > 0 {
 		chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "该图表已删除,自动查看下一图表"
 				br.ErrMsg = "该图表已删除,自动查看下一图表,Err:" + err.Error()
 				br.Ret = 406
@@ -4244,7 +4244,7 @@ func (this *ChartInfoController) ChartInfoConvertDetail() {
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -4646,7 +4646,7 @@ func (this *ChartInfoController) ChartList() {
 	if len(chartClassifyIdsStr) > 0 {
 		if !subClassify {
 			chartClassifyId, err := data_manage.GetChartClassifyByIdsNoSubClassify(chartClassifyIds)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取图表信息失败"
 				br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 				return
@@ -4726,7 +4726,7 @@ func (this *ChartInfoController) ChartList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -4744,7 +4744,7 @@ func (this *ChartInfoController) ChartList() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -4752,7 +4752,7 @@ func (this *ChartInfoController) ChartList() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -4844,7 +4844,7 @@ func (this *ChartInfoController) ChartList() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -4855,7 +4855,7 @@ func (this *ChartInfoController) ChartList() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -4923,7 +4923,7 @@ func (this *ChartInfoController) ModifyChartList() {
 		if len(chartClassifyIds) > 0 {
 			if !req.SubClassify {
 				chartClassifyId, err := data_manage.GetChartClassifyByIdsNoSubClassify(chartClassifyIds)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取图表信息失败"
 					br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 					return

+ 4 - 4
controllers/data_manage/chart_theme.go

@@ -401,7 +401,7 @@ func (c *ChartThemeController) Edit() {
 	// 获取配置
 	chartTheme, err := chart_theme.GetChartThemeId(req.ChartThemeId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "主题不存在或已删除"
 			br.ErrMsg = "主题不存在或已删除"
 			br.IsSendEmail = false
@@ -471,7 +471,7 @@ func (c *ChartThemeController) Delete() {
 	// 获取配置
 	chartTheme, err := chart_theme.GetChartThemeId(req.ChartThemeId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "主题不存在或已删除"
 			br.ErrMsg = "主题不存在或已删除"
 			br.IsSendEmail = false
@@ -559,7 +559,7 @@ func (c *ChartThemeController) SetDefaultTheme() {
 	// 获取图表配置
 	chartTheme, err := chart_theme.GetChartThemeId(req.ChartThemeId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "主题不存在或已删除"
 			br.ErrMsg = "主题不存在或已删除"
 			br.IsSendEmail = false
@@ -573,7 +573,7 @@ func (c *ChartThemeController) SetDefaultTheme() {
 	// 获取图表类型
 	chartThemeType, err := chart_theme.GetChartThemeTypeById(req.ChartThemeTypeId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "获取图表类型不存在或已删除"
 			br.ErrMsg = "获取图表类型不存在或已删除"
 			br.IsSendEmail = false

+ 8 - 8
controllers/data_manage/clarksons_data.go

@@ -179,7 +179,7 @@ func (this *ClarksonsDataController) EditClassify() {
 	}
 	classify, err := data_manage.GetClarksonsClassifyById(req.BaseFromClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}
@@ -271,7 +271,7 @@ func (this *ClarksonsDataController) IndexList() {
 	}()
 	classifyId, _ := this.GetInt("BaseFromClassifyId", 0)
 	indexList, err := data_manage.GetClarksonsIndexBaseInfoByClassifyId(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -411,7 +411,7 @@ func (this *ClarksonsDataController) SingleData() {
 		return
 	}
 	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_CLARKSONS, indexInfo.IndexCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标数据失败"
 		br.ErrMsg = "获取指标库数据失败,Err:" + err.Error()
 		return
@@ -613,7 +613,7 @@ func (this *ClarksonsDataController) MoveClarksonsData() {
 //
 //	_, err = data_manage.GetClarksonsIndexByIndexCode(req.EdbCode)
 //	if err != nil {
-//		if err.Error() == utils.ErrNoRow() {
+//		if utils.IsErrNoRow(err) {
 //			br.Msg = "指标不存在"
 //			return
 //		}
@@ -824,7 +824,7 @@ func (c *ClarksonsDataController) NameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_CLARKSONS, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取克拉克森已存在信息失败,Err:" + err.Error()
 			return
@@ -1539,7 +1539,7 @@ func (this *ClarksonsDataController) ClarksonsData() {
 		product.ModifyTime = v.ModifyTime
 
 		modifyTime, err := data_manage.GetClarksonsIndexLatestDate(v.IndexCode)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取更新时间失败"
 			br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
 			return
@@ -1605,7 +1605,7 @@ func (this *ClarksonsDataController) IndexPageList() {
 		}
 		total = tmpTotal
 		tmpIndexList, err := data_manage.GetClarksonsIndexByPage(startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -1633,7 +1633,7 @@ func (this *ClarksonsDataController) IndexPageList() {
 		}
 		total = tmpTotal
 		tmpIndexList, err := data_manage.GetClarksonsIndexByClassifyId(classifyIds, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return

+ 5 - 5
controllers/data_manage/com_trade.go

@@ -29,7 +29,7 @@ func (this *EdbInfoController) ComTradeCountryList() {
 	}
 
 	list, err := data_manage.GetComTradeCountryItemAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -161,14 +161,14 @@ func (this *EdbInfoController) ComTradeDataList() {
 	sortStr = fmt.Sprintf("%s %s,modify_time desc ", sortParam, sortType)
 
 	total, err := data_manage.GetComTradeListCount(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	list, err := data_manage.GetComTradeList(condition, pars, startSize, pageSize, sortStr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -178,7 +178,7 @@ func (this *EdbInfoController) ComTradeDataList() {
 	lastUpdateTimeStr := ``
 	// 获取用到的指标信息
 	comTradeList, err := data_manage.GetAllComTradeIndexList()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -247,7 +247,7 @@ func (this *EdbInfoController) ComTradeList() {
 	}
 
 	list, err := data_manage.GetComTradeIndexList(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 10 - 10
controllers/data_manage/correlation/correlation_chart_classify.go

@@ -62,7 +62,7 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 	nodeAll := make([]*data_manage.ChartClassifyItems, 0)
 	// 查询分类节点
 	rootList, err := data_manage.GetChartClassifyByParentId(parentId, utils.CHART_SOURCE_CORRELATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -155,19 +155,19 @@ func (this *CorrelationChartClassifyController) ChartClassifyList() {
 // getChartClassifyListForMe 获取我创建的图表
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_CORRELATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	classifyAll, err := data_manage.GetChartClassifyAll(utils.CHART_SOURCE_CORRELATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_CORRELATION, utils.CHART_SOURCE_CORRELATION}, adminInfo.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -367,7 +367,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -429,7 +429,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -453,7 +453,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -516,7 +516,7 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -536,14 +536,14 @@ func (this *CorrelationChartClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return

+ 21 - 21
controllers/data_manage/correlation/correlation_chart_info.go

@@ -335,7 +335,7 @@ func (this *CorrelationChartInfoController) Move() {
 	if chartInfo.ChartClassifyId != req.ChartClassifyId {
 		//查询需要修改的分类下是否存在同一个图表名称
 		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
@@ -394,7 +394,7 @@ func (this *CorrelationChartInfoController) Move() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -510,7 +510,7 @@ func (this *CorrelationChartInfoController) List() {
 
 	if chartClassifyId > 0 {
 		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -550,7 +550,7 @@ func (this *CorrelationChartInfoController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -568,7 +568,7 @@ func (this *CorrelationChartInfoController) List() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -576,7 +576,7 @@ func (this *CorrelationChartInfoController) List() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -620,7 +620,7 @@ func (this *CorrelationChartInfoController) List() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -631,7 +631,7 @@ func (this *CorrelationChartInfoController) List() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -682,7 +682,7 @@ func (this *CorrelationChartInfoController) Detail() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -807,7 +807,7 @@ func (this *CorrelationChartInfoController) Detail() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -963,7 +963,7 @@ func (this *CorrelationChartInfoController) DetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -1001,7 +1001,7 @@ func (this *CorrelationChartInfoController) DetailFromUniqueCode() {
 					myCond += ` AND a.chart_info_id=? `
 					myPars = append(myPars, chartInfo.ChartInfoId)
 					myList, err := data_manage.GetMyChartByCondition(myCond, myPars)
-					if err != nil && err.Error() != utils.ErrNoRow() {
+					if err != nil && !utils.IsErrNoRow(err) {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 						return
@@ -1072,7 +1072,7 @@ func (this *CorrelationChartInfoController) Refresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -1234,7 +1234,7 @@ func (this *CorrelationChartInfoController) Copy() {
 	chartInfo := new(data_manage.ChartInfo)
 	if originCorrelate.AnalysisMode != 1 {
 		multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByChartId(req.ChartInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = `保存失败`
 			br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 			return
@@ -1503,7 +1503,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -1724,7 +1724,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -1840,7 +1840,7 @@ func (this *CorrelationChartInfoController) EnInfoEdit() {
 	pars = append(pars, req.ChartInfoId, req.ChartNameEn, utils.CHART_SOURCE_CORRELATION)
 	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "判断英文图表名称是否存在失败"
 			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 			return
@@ -1953,7 +1953,7 @@ func (this *CorrelationChartInfoController) SearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1967,7 +1967,7 @@ func (this *CorrelationChartInfoController) SearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -2042,7 +2042,7 @@ func (this *CorrelationChartInfoController) Newest() {
 		this.ServeJSON()
 	}()
 	item, err := data_manage.GetChartInfoByNewest(utils.CHART_SOURCE_CORRELATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取最新图表失败"
 		br.ErrMsg = "获取最新图表失败,Err:" + err.Error()
 		return
@@ -2115,7 +2115,7 @@ func (this *CorrelationChartInfoController) BaseInfoEdit() {
 	pars = append(pars, req.ChartName)
 	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "判断英文图表名称是否存在失败"
 			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 			return

+ 21 - 21
controllers/data_manage/cross_variety/chart_info.go

@@ -84,7 +84,7 @@ func (c *ChartInfoController) List() {
 
 	if chartClassifyId > 0 {
 		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -124,7 +124,7 @@ func (c *ChartInfoController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(c.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -142,7 +142,7 @@ func (c *ChartInfoController) List() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -150,7 +150,7 @@ func (c *ChartInfoController) List() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -194,7 +194,7 @@ func (c *ChartInfoController) List() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -205,7 +205,7 @@ func (c *ChartInfoController) List() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -491,7 +491,7 @@ func (c *ChartInfoController) Detail() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -584,7 +584,7 @@ func (c *ChartInfoController) Detail() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -703,7 +703,7 @@ func (c *ChartInfoController) Relation() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -973,7 +973,7 @@ func (c *ChartInfoController) Move() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(chartInfo.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -1075,7 +1075,7 @@ func (c *ChartInfoController) Refresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -1160,7 +1160,7 @@ func (c *ChartInfoController) EnInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -1279,7 +1279,7 @@ func (c *ChartInfoController) DeleteChart() {
 	//删除图表
 	chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已删除,请刷新页面"
 			br.ErrMsg = "指标不存在,Err:" + err.Error()
 			return
@@ -1342,7 +1342,7 @@ func (c *ChartInfoController) DeleteChart() {
 	pars = append(pars, req.ChartInfoId)
 
 	nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "删除失败"
 		br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 		return
@@ -1362,14 +1362,14 @@ func (c *ChartInfoController) DeleteChart() {
 		tmpPars = append(tmpPars, chartInfo.ChartClassifyId)
 
 		classifyItem, err := data_manage.GetChartClassifyByCondition(tmpCondition, tmpPars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 			return
 		}
 		if classifyItem != nil {
 			nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 				return
@@ -1460,7 +1460,7 @@ func (c *ChartInfoController) SearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(c.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1474,7 +1474,7 @@ func (c *ChartInfoController) SearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -1558,7 +1558,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -1701,7 +1701,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -1883,7 +1883,7 @@ func (c *ChartInfoController) BaseInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return

+ 10 - 10
controllers/data_manage/cross_variety/classify.go

@@ -36,7 +36,7 @@ func (c *ClassifyController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(c.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -54,14 +54,14 @@ func (c *ClassifyController) List() {
 	}
 
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_CROSS_HEDGING)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoAll([]int{source})
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -195,7 +195,7 @@ func (c *ClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -257,7 +257,7 @@ func (c *ClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -281,7 +281,7 @@ func (c *ClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -344,7 +344,7 @@ func (c *ClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -364,14 +364,14 @@ func (c *ClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return
@@ -497,7 +497,7 @@ func (c *ClassifyController) ChartClassifyMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartClassifyByParentIdAndSource(chartClassifyInfo.ParentId, chartClassifyInfo.Source)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取跨品种分析图表分类排序第一条的分类信息失败,Err:" + err.Error()
 			return

+ 3 - 3
controllers/data_manage/cross_variety/tag.go

@@ -45,7 +45,7 @@ func (c *TagController) Add() {
 	}
 	TagName := utils.TrimStr(req.TagName)
 	item, err := cross_variety.GetTagByName(TagName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
@@ -110,7 +110,7 @@ func (c *TagController) Edit() {
 	TagName := utils.TrimStr(req.TagName)
 
 	item, err := cross_variety.GetTagByName(TagName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
@@ -248,7 +248,7 @@ func (c *TagController) Delete() {
 
 	varietyInfo, err := cross_variety.GetTagById(req.ChartTagId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该标签不存在或已删除"
 			br.IsSendEmail = false
 		} else {

+ 3 - 3
controllers/data_manage/cross_variety/variety.go

@@ -44,7 +44,7 @@ func (c *VarietyController) Add() {
 	}
 	varietyName := utils.TrimStr(req.VarietyName)
 	item, err := cross_variety.GetVarietyByName(varietyName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
@@ -109,7 +109,7 @@ func (c *VarietyController) Edit() {
 	varietyName := utils.TrimStr(req.VarietyName)
 
 	item, err := cross_variety.GetVarietyByName(varietyName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
@@ -246,7 +246,7 @@ func (c *VarietyController) Delete() {
 
 	varietyInfo, err := cross_variety.GetVarietyById(req.ChartVarietyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该品种不存在或已删除"
 			br.IsSendEmail = false
 		} else {

+ 18 - 18
controllers/data_manage/edb_classify.go

@@ -32,13 +32,13 @@ func (this *EdbClassifyController) ListV2() {
 		this.ServeJSON()
 	}()
 	rootList, err := data_manage.GetEdbClassifyByParentId(0, 0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 	classifyAll, err := data_manage.GetEdbClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -60,7 +60,7 @@ func (this *EdbClassifyController) ListV2() {
 	// 获取当前账号的不可见指标
 	obj := data_manage.EdbInfoNoPermissionAdmin{}
 	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 		return
@@ -70,7 +70,7 @@ func (this *EdbClassifyController) ListV2() {
 		noPermissionEdbInfoIdMap[v.EdbInfoId] = true
 	}
 	allEdbInfo, err := data_manage.GetEdbInfoAll(utils.EDB_INFO_TYPE)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -653,13 +653,13 @@ func (this *EdbClassifyController) ItemsV2() {
 		this.ServeJSON()
 	}()
 	rootList, err := data_manage.GetEdbClassifyByParentId(0, 0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 	classifyAll, err := data_manage.GetEdbClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -778,7 +778,7 @@ func (this *EdbClassifyController) ClassifyEdbInfoList() {
 	// 获取当前账号的不可见指标
 	obj := data_manage.EdbInfoNoPermissionAdmin{}
 	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 		return
@@ -789,7 +789,7 @@ func (this *EdbClassifyController) ClassifyEdbInfoList() {
 	}
 
 	allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(classifyId, 0, 0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -839,19 +839,19 @@ func (this *EdbClassifyController) ItemsV3() {
 		this.ServeJSON()
 	}()
 	rootList, err := data_manage.GetEdbClassifyByParentId(0, 0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 	rootTwoList, err := data_manage.GetEdbClassifyByParentIdTwo(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 	classifyAll, err := data_manage.GetEdbClassifyAllV2(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -977,7 +977,7 @@ func (this *EdbClassifyController) SimpleList() {
 		sysUserId = this.SysUser.AdminId
 	}
 	rootList, err := data_manage.GetEdbClassifyByParentId(parentId, 0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -990,7 +990,7 @@ func (this *EdbClassifyController) SimpleList() {
 		// 获取当前账号的不可见指标
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1114,7 +1114,7 @@ func (this *EdbClassifyController) ClassifyTree() {
 	}()
 	level, _ := this.GetInt(`Level`)
 	allList, err := data_manage.GetNormalEdbClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1289,7 +1289,7 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 			pars = append(pars, classifyIdsArr)
 		} else {
 			classifyAll, err := data_manage.GetNormalEdbClassifyAll()
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取数据失败,Err:" + err.Error()
 				return
@@ -1342,7 +1342,7 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 	// 获取当前账号的不可见指标
 	obj := data_manage.EdbInfoNoPermissionAdmin{}
 	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 		return
@@ -1357,7 +1357,7 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 	}
 
 	count, err := data_manage.GetEdbInfoByConditionCount(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1365,7 +1365,7 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 	page := paging.GetPaging(currentIndex, pageSize, count)
 
 	list, err := data_manage.GetEdbInfoListByCondition(condition, pars, startSize, pageSize, "")
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 101 - 103
controllers/data_manage/edb_info.go

@@ -99,7 +99,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 	if item == nil {
 		item, err = data_manage.GetEdbInfoByEdbCode(source, edbCode)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取失败,Err:" + err.Error()
 				return
@@ -125,7 +125,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 		// 查询该指标是否有权限
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		conf, err := obj.GetByEdbInfoIdAndAdminId(this.SysUser.AdminId, item.EdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取当前账号的不可见指标配置失败,err:" + err.Error()
 			return
@@ -143,7 +143,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			fmt.Println("subSource:", subSource)
 			if subSource == utils.DATA_SUB_SOURCE_EDB {
 				dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_THS, subSource, utils.EDB_DATA_LIMIT)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取Ths已存在信息失败,Err:" + err.Error()
 					return
@@ -218,7 +218,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			fmt.Println("subSource:", subSource)
 			if subSource == utils.DATA_SUB_SOURCE_EDB {
 				dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_WIND, subSource, utils.EDB_DATA_LIMIT)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取Wind已存在信息失败,Err:" + err.Error()
 					return
@@ -296,7 +296,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 		} else if source == utils.DATA_SOURCE_PB || source == utils.DATA_SOURCE_PB_FINANCE {
 			fmt.Println("pb data exist")
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取Pb已存在信息失败,Err:" + err.Error()
 				return
@@ -337,7 +337,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_MANUAL { //手工数据指标
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_MANUAL, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取Ths已存在信息失败,Err:" + err.Error()
 				return
@@ -378,7 +378,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			manualInfo, err := models.GetEdbinfoByTradeCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取手工指标详情失败,Err:" + err.Error()
 				return
@@ -391,7 +391,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 		} else if source == utils.DATA_SOURCE_LZ {
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_LZ, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取隆众已存在信息失败,Err:" + err.Error()
 				return
@@ -433,7 +433,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			lzInfo, err := data_manage.GetLongzhongSurveyProductByCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取手工指标详情失败,Err:" + err.Error()
 				return
@@ -460,7 +460,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_YS { //有色网
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_YS, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取Ys已存在信息失败,Err:" + err.Error()
 				return
@@ -507,7 +507,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			smmInfo, err := data_manage.GetBaseFromSmmIndexByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取有色指标详情失败,Err:" + err.Error()
 				return
@@ -520,7 +520,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 		} else if source == utils.DATA_SOURCE_GL { //钢联
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 				return
@@ -560,7 +560,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			glInfo, err := data_manage.GetGlIndexByCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联指标详情失败,Err:" + err.Error()
 				return
@@ -584,7 +584,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取郑商所已存在信息失败,Err:" + err.Error()
 				return
@@ -628,7 +628,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseInfoFromZhengzhouByIndexCode(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取郑商所指标详情失败,Err:" + err.Error()
 				return
@@ -662,7 +662,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取大商所已存在信息失败,Err:" + err.Error()
 				return
@@ -707,7 +707,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseInfoFromDalianByIndexCode(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取大商所指标详情失败,Err:" + err.Error()
 				return
@@ -741,7 +741,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所已存在信息失败,Err:" + err.Error()
 				return
@@ -786,7 +786,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseInfoFromShByIndexCode(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所指标详情失败,Err:" + err.Error()
 				return
@@ -820,7 +820,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取中金所已存在信息失败,Err:" + err.Error()
 				return
@@ -865,7 +865,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseInfoFromCffexByIndexCode(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取中金所指标详情失败,Err:" + err.Error()
 				return
@@ -899,7 +899,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期能源已存在信息失败,Err:" + err.Error()
 				return
@@ -944,7 +944,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseInfoFromShfeByIndexCode(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期能源指标详情失败,Err:" + err.Error()
 				return
@@ -993,7 +993,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取欧洲天然气已存在信息失败,Err:" + err.Error()
 				return
@@ -1039,7 +1039,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseFromEicDataAllByIndexCodeV2(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取欧洲天然气指标详情失败,Err:" + err.Error()
 				return
@@ -1101,7 +1101,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_LT, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取 lt 已存在信息失败,Err:" + err.Error()
 				return
@@ -1157,7 +1157,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取煤炭网已存在信息失败,Err:" + err.Error()
 				return
@@ -1202,7 +1202,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			allInfo, err := data_manage.GetBaseInfoFromCoalByIndexCode(edbCode, suffix)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取煤炭网指标详情失败,Err:" + err.Error()
 				return
@@ -1218,7 +1218,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_GOOGLE_TRAVEL { //谷歌出行数据
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取煤炭网已存在信息失败,Err:" + err.Error()
 				return
@@ -1253,7 +1253,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL { //钢联化工
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 				return
@@ -1293,7 +1293,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			glInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联指标详情失败,Err:" + err.Error()
 				return
@@ -1305,7 +1305,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_EIA_STEO { //eia steo报告
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 				return
@@ -1338,7 +1338,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			eiasteoInfo, err := data_manage.GetBaseFromEiaSteoIndexByCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联指标详情失败,Err:" + err.Error()
 				return
@@ -1350,7 +1350,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_COM_TRADE { // un数据源
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取联合国商品贸易数据已存在信息失败,Err:" + err.Error()
 				return
@@ -1383,7 +1383,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			eiasteoInfo, err := data_manage.GetComTradeIndex(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取钢联指标详情失败,Err:" + err.Error()
 				return
@@ -1404,7 +1404,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_SCI { //卓创数据(红桃三)
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取SCI已存在信息失败,Err:" + err.Error()
 				return
@@ -1451,7 +1451,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			smmInfo, err := data_manage.GetBaseFromSciIndexByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取Sci指标详情失败,Err:" + err.Error()
 				return
@@ -1464,7 +1464,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 		} else if source == utils.DATA_SOURCE_BAIINFO { //百川盈孚
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取BAIINFO已存在信息失败,Err:" + err.Error()
 				return
@@ -1511,7 +1511,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			baiInfo, err := data_manage.GetBaseFromBaiinfoIndexByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取Baiinfo指标详情失败,Err:" + err.Error()
 				return
@@ -1524,7 +1524,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 		} else if source == utils.DATA_SOURCE_NATIONAL_STATISTICS { // 国家统计局
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取国家统计局已存在信息失败,Err:" + err.Error()
 				return
@@ -1557,7 +1557,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			nationalInfo, err := data_manage.GetBaseFromNationalStatisticsIndexByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取国家统计局详情失败,Err:" + err.Error()
 				return
@@ -1569,7 +1569,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_FUBAO { //数宝
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_FUBAO, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取Fubao已存在信息失败,Err:" + err.Error()
 				return
@@ -1604,7 +1604,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_GFEX { //广州期货交易所
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所已存在信息失败,Err:" + err.Error()
 				return
@@ -1638,7 +1638,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			indexInfo, err := data_manage.GetBaseInfoFromGzByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所指标详情失败,Err:" + err.Error()
 				return
@@ -1651,7 +1651,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_ICPI { //消费者指数
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所已存在信息失败,Err:" + err.Error()
 				return
@@ -1685,7 +1685,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			indexInfo, err := data_manage.GetBaseInfoFromIcpiByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所指标详情失败,Err:" + err.Error()
 				return
@@ -1699,14 +1699,14 @@ func (this *EdbInfoController) EdbInfoSearch() {
 		} else if source == utils.DATA_SOURCE_BUSINESS { //自有数据
 			indexObj := data_manage.BaseFromBusinessIndex{}
 			indexInfo, err := indexObj.GetDetailByEdbCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取自有数据指标信息失败,Err:" + err.Error()
 				return
 			}
 
 			_, tmpDataList, err := data.GetPageBaseBusinessIndexData(edbCode, 1, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取自有数据已存在信息失败,Err:" + err.Error()
 				return
@@ -1727,7 +1727,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			searchItem.EdbName = indexInfo.IndexName
 		} else if source == utils.DATA_SOURCE_SCI99 { //卓创资讯
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所已存在信息失败,Err:" + err.Error()
 				return
@@ -1761,7 +1761,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			indexInfo, err := data_manage.GetBaseInfoFromSci99ByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取上期所指标详情失败,Err:" + err.Error()
 				return
@@ -1774,7 +1774,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_SCI_HQ {
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取SCIHQ已存在信息失败,Err:" + err.Error()
 				return
@@ -1808,7 +1808,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 			//获取指标信息
 			sciHqInfo, err := data_manage.GetSciHqIndexByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取SciHq指标详情失败,Err:" + err.Error()
 				return
@@ -1820,7 +1820,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_OILCHEM { //隆众资讯
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取隆众资讯已存在信息失败,Err:" + err.Error()
 				return
@@ -1854,7 +1854,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			indexInfo, err := data_manage.GetBaseInfoFromOilchemByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取隆众资讯指标详情失败,Err:" + err.Error()
 				return
@@ -1867,7 +1867,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 			}
 		} else if source == utils.DATA_SOURCE_HISUGAR { //泛糖科技
 			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取泛糖科技已存在信息失败,Err:" + err.Error()
 				return
@@ -1901,7 +1901,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			//获取指标信息
 			indexInfo, err := data_manage.GetBaseInfoFromHisugarByIndexCode(edbCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取泛糖科技指标详情失败,Err:" + err.Error()
 				return
@@ -2061,7 +2061,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 						indexCode := utils.WindDbWsd + stockCode + v
 
 						dataList, err := data_manage.GetEdbDataAllByEdbCodeAndSubSource(indexCode, source, utils.DATA_SUB_SOURCE_DATE, utils.EDB_DATA_LIMIT)
-						if err != nil && err.Error() != utils.ErrNoRow() {
+						if err != nil && !utils.IsErrNoRow(err) {
 							br.Msg = "获取失败"
 							br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
 							return
@@ -2081,7 +2081,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 						indexCode := utils.ThsDs + stockCode + v
 
 						dataList, err := data_manage.GetEdbDataAllByEdbCodeAndSubSource(indexCode, source, utils.DATA_SUB_SOURCE_DATE, utils.EDB_DATA_LIMIT)
-						if err != nil && err.Error() != utils.ErrNoRow() {
+						if err != nil && !utils.IsErrNoRow(err) {
 							br.Msg = "获取失败"
 							br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
 							return
@@ -2101,7 +2101,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				}
 			} else {
 				dataList, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, subSource, utils.EDB_DATA_LIMIT)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
 					return
@@ -2109,7 +2109,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.DataList = dataList
 
 				edbInfoMaxAndMinInfo, err := data_manage.GetEdbInfoMaxAndMinInfo(source, subSource, edbCode)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取数据失败,GetEdbInfoMaxAndMinInfo Err:" + err.Error()
 					return
@@ -2198,7 +2198,7 @@ func (this *EdbInfoController) EdbInfoList() {
 		// 获取当前账号的不可见指标配置
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		conf, err := obj.GetByEdbInfoIdAndAdminId(this.SysUser.AdminId, edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取当前账号的不可见指标配置失败,err:" + err.Error()
 			return
@@ -2228,14 +2228,14 @@ func (this *EdbInfoController) EdbInfoList() {
 	}
 	//获取指标信息
 	edbInfoItem, err := data_manage.GetEdbInfoByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
 	}
 
-	if edbInfoItem == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if edbInfoItem == nil || (err != nil && utils.IsErrNoRow(err)) {
 		item := new(data_manage.EdbInfoList)
 		resp.Paging = page
 		resp.Item = item
@@ -2286,7 +2286,7 @@ func (this *EdbInfoController) EdbInfoList() {
 	// 如果有数据权限,那么就去获取指标数据
 	if edbInfoItem.HaveOperaAuth {
 		dataCount, dataList, err := data.GetPageData(edbInfoItem.EdbInfoId, edbInfoItem.Source, edbInfoItem.SubSource, "", startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标信息失败"
 			br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 			return
@@ -2298,7 +2298,7 @@ func (this *EdbInfoController) EdbInfoList() {
 	// 获取指标插入配置
 	{
 		edbDataInsertConfig, err := data_manage.GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标信息失败"
 			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
 			return
@@ -2407,7 +2407,7 @@ func (this *EdbInfoController) EdbInfoAdd() {
 		// 如果是钢联的话,那么就先判断是不是存在钢联化工
 		tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(req.EdbCode)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取失败,Err:" + err.Error()
 				return
@@ -2760,7 +2760,7 @@ func (this *EdbInfoController) EdbEnInfoEdit() {
 
 		edbExist, err := data_manage.GetEdbInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文指标名称是否存在失败"
 				br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
 				return
@@ -2887,7 +2887,7 @@ func (this *EdbInfoController) EdbInfoBaseEdit() {
 
 		edbExist, err := data_manage.GetEdbInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文指标名称是否存在失败"
 				br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
 				return
@@ -2961,7 +2961,7 @@ func (this *EdbInfoController) EdbInfoNewest() {
 		this.ServeJSON()
 	}()
 	item, err := data_manage.GetEdbInfoByNewest()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取最新指标失败"
 		br.ErrMsg = "获取最新指标失败,Err:" + err.Error()
 		return
@@ -2999,7 +2999,7 @@ func (this *EdbInfoController) EdbInfoRefresh() {
 	}
 	_, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "数据已被删除,请刷新页面"
 			br.ErrMsg = "数据已被删除,请刷新页面,edbInfoId:" + strconv.Itoa(edbInfoId)
 			return
@@ -3142,7 +3142,7 @@ func (this *EdbInfoController) EdbInfoMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstEdbInfoByClassifyId(req.ClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -3293,7 +3293,7 @@ func (this *EdbInfoController) EdbInfoFilter() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -3355,7 +3355,7 @@ func (this *EdbInfoController) EdbInfoFilter() {
 
 		condition += conditionWhere + baseCondition
 		newEdbInfoList, err := data_manage.GetEdbInfoFilter(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Success = true
 			br.Msg = "获取指标信息失败"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
@@ -3454,7 +3454,7 @@ func (this *EdbInfoController) EdbInfoFilterByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -3804,7 +3804,7 @@ func (this *EdbInfoController) EdbInfoAllRefresh() {
 	}
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "数据已被删除,请刷新页面"
 			br.ErrMsg = "数据已被删除,请刷新页面,edbInfoId:" + strconv.Itoa(edbInfoId)
 			return
@@ -3880,7 +3880,7 @@ func (this *ChartInfoController) EdbInfoData() {
 
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Ret = 200
 			return
 		}
@@ -4163,7 +4163,7 @@ func (this *EdbInfoController) RelationChartList() {
 	chartIdMap := make(map[int]bool)
 	// 查询指标绑定的图表
 	edbListTemp, err := data_manage.GetEdbMappingListByEdbInfoId(edbInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -4176,7 +4176,7 @@ func (this *EdbInfoController) RelationChartList() {
 	// 查询相关性的图表
 	correlationChart := new(data_manage.ChartInfoCorrelation)
 	correlationChartId, err := correlationChart.GetChartInfoIdByEdb(edbInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -4186,7 +4186,7 @@ func (this *EdbInfoController) RelationChartList() {
 	}
 	// 查询跨品种的图表
 	tagXList, err := cross_variety.GetChartInfoCrossVarietyByXEdbInfoId(edbInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -4199,7 +4199,7 @@ func (this *EdbInfoController) RelationChartList() {
 	}
 
 	tagYList, err := cross_variety.GetChartInfoCrossVarietyByYEdbInfoId(edbInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -4214,7 +4214,7 @@ func (this *EdbInfoController) RelationChartList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -4245,14 +4245,14 @@ func (this *EdbInfoController) RelationChartList() {
 	// 得到图表ID
 	//获取关联图表列表
 	list, err := data_manage.GetRelationChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
 	}
 
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -4264,7 +4264,7 @@ func (this *EdbInfoController) RelationChartList() {
 
 	// 获取关联图表总数
 	dataCount, err := data_manage.GetRelationChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -4272,7 +4272,7 @@ func (this *EdbInfoController) RelationChartList() {
 
 	// 获取MY ETA 图表,用来判断是否加入我的图库
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -4398,7 +4398,7 @@ func (this *EdbInfoController) RelationEdbList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -4415,14 +4415,14 @@ func (this *EdbInfoController) RelationEdbList() {
 
 	//获取关联图表列表
 	list, err := data_manage.GetRelationEdbInfoListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
 	}
 
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartEdbInfoMapping, 0)
 		resp.Paging = page
 		resp.List = items
@@ -4434,7 +4434,7 @@ func (this *EdbInfoController) RelationEdbList() {
 
 	// 获取关联图表总数
 	dataCount, err := data_manage.GetRelationEdbInfoListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -4841,7 +4841,7 @@ func (this *EdbInfoController) TraceEdbInfo() {
 	if err != nil {
 		br.Msg = "获取失败"
 		br.Msg = "获取失败,Err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标不存在"
 		}
 		return
@@ -4912,7 +4912,7 @@ func (this *EdbInfoController) AllEdbInfoByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -5880,7 +5880,7 @@ func (this *EdbInfoController) EdbInfoExistCheck() {
 		}
 	}
 	indexList, err := data_manage.GetEdbInfoByEdbCodeList(source, indexCodeArr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "校验指标是否存在失败"
 		br.ErrMsg = "校验指标是否存在失败,Err:" + err.Error()
 		return
@@ -6254,7 +6254,7 @@ func (this *EdbInfoController) SmmExistCheck() {
 	}
 
 	indexList, err := data_manage.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_YS, edbCodeArr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "校验指标是否存在失败"
 		br.ErrMsg = "校验指标是否存在失败,Err:" + err.Error()
 		return
@@ -6429,7 +6429,7 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 	}
 	edbCodeStr = strings.Trim(edbCodeStr, ",")
 	smmInfoList, err := data_manage.GetBaseFromSmmIndexByIndexCodes(edbCodeStr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取有色指标详情失败,Err:" + err.Error()
 		return
@@ -6448,7 +6448,7 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 
 	for _, edbCode := range edbCodeArr {
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_YS, utils.DATA_SUB_SOURCE_EDB, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取Ys已存在信息失败,Err:" + err.Error()
 			return
@@ -6518,7 +6518,7 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 				searchItem.EdbName = smmInfo.IndexName
 				searchItem.EdbCode = smmInfo.IndexCode
 				dataList, err := data_manage.GetEdbDataAllByEdbCode(smmInfo.IndexCode, utils.DATA_SOURCE_YS, utils.DATA_SUB_SOURCE_EDB, utils.EDB_DATA_LIMIT)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
 					return
@@ -6799,7 +6799,6 @@ func (this *EdbInfoController) ModifyEdbList() {
 
 	classifyIds := strings.Split(req.EdbClassifyIds, ",")
 
-
 	if !req.SelectAll && req.EdbInfoIds == "" {
 		br.Msg = "请选择图表"
 		return
@@ -6840,7 +6839,7 @@ func (this *EdbInfoController) ModifyEdbList() {
 				pars = append(pars, classifyIdsArr)
 			} else {
 				classifyAll, err := data_manage.GetNormalEdbClassifyAll()
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取数据失败,Err:" + err.Error()
 					return
@@ -6886,7 +6885,7 @@ func (this *EdbInfoController) ModifyEdbList() {
 		// 获取当前账号的不可见指标
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -6901,7 +6900,7 @@ func (this *EdbInfoController) ModifyEdbList() {
 		}
 
 		count, err := data_manage.GetEdbInfoByConditionCount(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -6912,13 +6911,12 @@ func (this *EdbInfoController) ModifyEdbList() {
 		}
 
 		list, err := data_manage.GetEdbInfoListByCondition(condition, pars, 0, 0, "")
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
 
-
 		for _, v := range list {
 			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 		}
@@ -6952,4 +6950,4 @@ func (this *EdbInfoController) ModifyEdbList() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
-}
+}

+ 6 - 6
controllers/data_manage/edb_info_calculate.go

@@ -764,7 +764,7 @@ func (this *ChartInfoController) CalculateBatchEdit() {
 
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标已被删除,请刷新页面"
 			br.ErrMsg = "指标已被删除,请刷新页面:Err:" + err.Error()
 			return
@@ -933,7 +933,7 @@ func (this *ChartInfoController) CalculateBatchReset() {
 
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标已被删除,请刷新页面"
 			br.ErrMsg = "指标已删除,请刷新页面:Err:" + err.Error()
 			return
@@ -968,7 +968,7 @@ func (this *ChartInfoController) CalculateBatchReset() {
 	//	for _, v := range fromEdbInfoList {
 	//		edbInfo, err := data_manage.GetEdbInfoById(v.FromEdbInfoId)
 	//		if err != nil {
-	//			if err.Error() == utils.ErrNoRow() {
+	//			if utils.IsErrNoRow(err) {
 	//				br.Msg = "重新计算失败"
 	//				br.Msg = "指标 " + strconv.Itoa(v.FromEdbInfoId) + " 不存在"
 	//				return
@@ -1347,7 +1347,7 @@ func (this *ChartInfoController) EditPythonEdb() {
 	//获取指标信息
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标已被删除,请刷新页面"
 			br.ErrMsg = "指标已被删除,请刷新页面:Err:" + err.Error()
 			return
@@ -2252,7 +2252,7 @@ func (this *ChartInfoController) CalculateMultiChoice() {
 	}
 
 	list, err := data_manage.GetEdbInfoByIdList(edbIdArr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标列表失败"
 		br.ErrMsg = "获取指标列表失败,Err:" + err.Error()
 		return
@@ -2445,7 +2445,7 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 		}
 
 		list, err := data_manage.GetEdbInfoByIdList(edbIdArr)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标列表失败"
 			br.ErrMsg = "获取指标列表失败,Err:" + err.Error()
 			return

+ 9 - 9
controllers/data_manage/edb_info_refresh.go

@@ -97,14 +97,14 @@ func (c *EdbInfoController) RefreshClassifyList() {
 	switch source {
 	case utils.DATA_SOURCE_MYSTEEL_CHEMICAL: // 钢联
 		rootList, err := data_manage.GetBaseFromMysteelChemicalClassifyByParentId(0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
 
 		classifyAll, err := data_manage.GetAllBaseFromMysteelChemicalClassify()
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -161,14 +161,14 @@ func (c *EdbInfoController) RefreshClassifyList() {
 			Children:     nil,
 		})
 		rootList, err := data_manage.GetBaseFromSmmClassifyByParentId(0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
 
 		classifyAll, err := data_manage.GetAllBaseFromSmmClassify()
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -204,7 +204,7 @@ func (c *EdbInfoController) RefreshClassifyList() {
 
 	default:
 		tmpList, err := data_manage.GetAllEdbClassify()
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -313,7 +313,7 @@ func (c *EdbInfoController) RefreshEdbList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
 	total, list, err := data.GetList(source, subSource, classifyId, terminalCode, sysUserId, frequency, keyword, status, startSize, pageSize, sortParam, sortType)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -490,7 +490,7 @@ func (c *EdbInfoController) SaveEdbRefreshStatus() {
 	if req.IsSelectAll {
 		// 如果是列表全选
 		_, edbList, err := data.GetList(req.Source, req.SubSource, req.ClassifyId, req.TerminalCode, req.SysUserId, req.Frequency, req.Keyword, req.Status, 0, 100000, "", "")
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -607,7 +607,7 @@ func (c *EdbInfoController) SaveEdbRefreshStatusSingle() {
 	// 查询指标
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标不存在"
 			return
 		}
@@ -694,7 +694,7 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 	if req.IsSelectAll {
 		// 如果是列表全选
 		_, edbList, err := data.GetEdbRelationList(req.Source, edbType, req.ClassifyId, req.SysUserId, req.Frequency, req.Keyword, req.Status, 0, 100000, "", "")
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return

+ 8 - 8
controllers/data_manage/edb_info_relation.go

@@ -80,7 +80,7 @@ func (c *EdbInfoRelationController) RelationEdbList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
 	total, list, err := data.GetEdbRelationList(source, edbType, classifyId, sysUserId, frequency, keyword, status, startSize, pageSize, sortParam, sortType)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -127,7 +127,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
 	total, relationList, err := data_manage.GetEdbInfoRelationDetailList(edbInfoId, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -164,7 +164,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 	objectNameMap := make(map[string]string)
 	if len(sandboxIds) > 0 {
 		sandboxList, err := sandbox.GetSandboxNameByIds(sandboxIds)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
@@ -182,7 +182,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 		pars := make([]interface{}, 0)
 		pars = append(pars, eventInfoIds)
 		eventList, err := matterOb.GetItemsByCondition(cond, pars, []string{}, "")
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取事件日历数据失败,Err:" + err.Error()
 			return
@@ -196,7 +196,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 	// 查询图表
 	if len(chartInfoIds) > 0 {
 		chartList, err := data_manage.GetChartInfoByIdList(chartInfoIds)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表数据失败,Err:" + err.Error()
 			return
@@ -213,7 +213,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 		pars := make([]interface{}, 0)
 		pars = append(pars, tableInfoIds)
 		tableList, err := excel.GetNoContentExcelInfoListByConditionNoPage(cond, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取表格数据失败,Err:" + err.Error()
 			return
@@ -231,7 +231,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 			pars = make([]interface{}, 0)
 			pars = append(pars, parentIds)
 			parentList, err := excel.GetNoContentExcelInfoListByConditionNoPage(cond, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取表格数据失败,Err:" + err.Error()
 				return
@@ -254,7 +254,7 @@ func (c *EdbInfoRelationController) RelationEdbListDetail() {
 	// 查询预测指标名称
 	if len(predictEdbIds) > 0 {
 		predictList, err := data_manage.GetEdbInfoByIdList(predictEdbIds)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取预测指标信息失败,Err:" + err.Error()
 			return

+ 2 - 2
controllers/data_manage/eia_steo.go

@@ -557,7 +557,7 @@ func (c *EdbInfoController) EiaSteoNameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_EIA_STEO, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 			return
@@ -815,7 +815,7 @@ func (this *EdbInfoController) EiaSteoAdd() {
 
 	tmpInfo, err := data_manage.GetBaseFromEiaSteoIndexByCode(req.EdbCode)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败,Err:" + err.Error()
 			return

+ 6 - 6
controllers/data_manage/excel/balance_table.go

@@ -713,7 +713,7 @@ func (c *ExcelInfoController) GetBalanceChartList() {
 	// 查询所有子表
 	excelInfo, err := excel.GetExcelInfoById(excelInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "表格不存在"
 			return
 		}
@@ -811,7 +811,7 @@ func (c *ExcelInfoController) DeleteBalanceChart() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -1596,7 +1596,7 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -1619,7 +1619,7 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 		edbInfoId := v.EdbInfoId
 		edbInfo, err := excel.GetExcelChartEdbById(edbInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表不存在!"
 				br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoId)
 				return
@@ -1654,7 +1654,7 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 
 			edbExist, err := excel.GetBalanceChartEdbByCondition(edbCondition, edbPars)
 			if err != nil {
-				if err.Error() != utils.ErrNoRow() {
+				if !utils.IsErrNoRow(err) {
 					br.Msg = "判断英文指标名称是否存在失败"
 					br.ErrMsg = "判断英文指标名称是否存在失败,Err:" + err.Error()
 					return
@@ -1686,7 +1686,7 @@ func (this *ExcelInfoController) BalanceChartInfoBaseEdit() {
 
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return

+ 7 - 7
controllers/data_manage/excel/custom_analysis.go

@@ -62,7 +62,7 @@ func (c *CustomAnalysisController) ExcelByName() {
 	// 获取数据详情
 	excelDetail, err := excelModel.GetNoContentExcelInfoByName(excelName, utils.CUSTOM_ANALYSIS_TABLE, sysUser.AdminId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "获取成功"
@@ -413,7 +413,7 @@ func (c *CustomAnalysisController) BaseExcelDetail() {
 	// 获取数据详情
 	excelDetail, err := excelModel.GetNoContentExcelInfoByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "获取成功"
@@ -571,7 +571,7 @@ func (c *CustomAnalysisController) ExcelDataList() {
 	// 获取数据详情
 	excelDetail, err := excelModel.GetNoContentExcelInfoByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Ret = 200
 			br.Success = true
 			br.Msg = "获取成功"
@@ -796,7 +796,7 @@ func (c *CustomAnalysisController) ClassifyList() {
 		classifyMap[v.ExcelClassifyId] = v
 	}
 	allExcelInfo, err := excelModel.GetNoContentExcelInfoAll(source, sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取表格信息失败,Err:" + err.Error()
 		return
@@ -959,7 +959,7 @@ func (c *CustomAnalysisController) List() {
 	// 筛选分类
 	if !isShare && excelClassifyId > 0 {
 		_, err := excelModel.GetExcelClassifyById(excelClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取表格信息失败"
 			br.ErrMsg = "获取信息失败,GetExcelClassify,Err:" + err.Error()
 			return
@@ -1000,7 +1000,7 @@ func (c *CustomAnalysisController) List() {
 	}
 	startSize = paging.StartIndex(currentIndex, pageSize)
 	list, err := excelModel.GetNoContentExcelListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取表格信息失败"
 		br.ErrMsg = "获取表格信息失败,Err:" + err.Error()
@@ -1013,7 +1013,7 @@ func (c *CustomAnalysisController) List() {
 
 	// 总数据量
 	dataCount, err := excelModel.GetExcelListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取表格列表信息失败"
 		br.ErrMsg = "获取表格列表数据总数失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/data_manage/excel/custom_analysis_edb.go

@@ -312,7 +312,7 @@ func (c *CustomAnalysisController) EditEdb() {
 
 	edbInfo, err := data_manage.GetEdbInfoById(req.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标已被删除,请刷新页面"
 			br.ErrMsg = "指标已被删除,请刷新页面:Err:" + err.Error()
 			return

+ 13 - 13
controllers/data_manage/excel/excel_classify.go

@@ -87,14 +87,14 @@ func (this *ExcelClassifyController) List() {
 		}
 
 		allExcelInfo, err = excel.GetBalanceNoContentExcelInfoAll(source, excelIds, showUserId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取表格信息失败,Err:" + err.Error()
 			return
 		}
 	} else {
 		allExcelInfo, err = excel.GetNoContentExcelInfoAll(source, showUserId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取表格信息失败,Err:" + err.Error()
 			return
@@ -196,7 +196,7 @@ func AnalysisClassifyList(this *ExcelClassifyController) (br *models.BaseRespons
 	// 获取三级分类
 	// 根据来源获取所有excel表格(无内容)
 	allExcelInfo, err := excel.GetNoContentExcelInfoAll(source, showUserId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取表格信息失败,Err:" + err.Error()
 		return
@@ -432,7 +432,7 @@ func (this *ExcelClassifyController) AddExcelClassify() {
 		var parent *excel.ExcelClassify
 		parent, err = excel.GetExcelClassifyById(req.ParentId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "父级分类不存在"
 				return
 			}
@@ -577,7 +577,7 @@ func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 	// 校验是否存在该分类
 	ExcelClassifyInfo, err := excel.GetExcelClassifyById(req.ExcelClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该分类不存在"
 			br.ErrMsg = "该分类不存在"
 			return
@@ -621,7 +621,7 @@ func (this *ExcelClassifyController) DeleteExcelClassifyCheck() {
 				var pars []interface{}
 				pars = append(pars, classifyIds)
 				childCount, err := excel.GetExcelInfoCountByCondition(condition, pars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "查询分类下表格数量失败,Err:" + err.Error()
 					return
@@ -701,7 +701,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 	if req.ExcelClassifyId > 0 && req.ExcelInfoId == 0 {
 		//判断是否含有指标
 		count, err := excel.GetExcelInfoCountByClassifyId(req.ExcelClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -727,7 +727,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 				var pars []interface{}
 				pars = append(pars, classifyIds)
 				childCount, err := excel.GetExcelInfoCountByCondition(condition, pars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "查询分类下表格数量失败,Err:" + err.Error()
 					return
@@ -744,7 +744,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 		if err != nil {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取分类失败,Err:" + err.Error()
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类不存在"
 				br.ErrMsg = "分类不存在"
 			}
@@ -764,7 +764,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 	if req.ExcelInfoId > 0 {
 		excelInfo, err := excel.GetExcelInfoById(req.ExcelInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "表格已删除,请刷新页面"
 				br.ErrMsg = "表格已删除,请刷新页面"
 				return
@@ -808,7 +808,7 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 			pars = append(pars, excelInfo.Sort, excelInfo.Sort, excelInfo.ExcelInfoId)
 
 			nextItem, err = excel.GetNextExcelInfoByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级表格信息失败,Err:" + err.Error()
 				return
@@ -817,14 +817,14 @@ func (this *ExcelClassifyController) DeleteExcelClassify() {
 			// 如果没找到,那么查找下一个分类的第一个表格
 			if nextItem == nil {
 				currClassifyInfo, err := excel.GetExcelClassifyById(excelInfo.ExcelClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取当前表格分类信息失败,Err:" + err.Error()
 					return
 				}
 
 				nextItem, err = excel.GetNextExcelInfo(excelInfo.ExcelClassifyId, currClassifyInfo.Sort, currClassifyInfo.Source)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级表格信息失败,Err:" + err.Error()
 					return

+ 13 - 13
controllers/data_manage/excel/excel_info.go

@@ -422,7 +422,7 @@ func (c *ExcelInfoController) List() {
 	// 筛选分类
 	if excelClassifyId > 0 {
 		_, err := excel3.GetExcelClassifyById(excelClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取表格信息失败"
 			br.ErrMsg = "获取信息失败,GetExcelClassify,Err:" + err.Error()
 			return
@@ -565,7 +565,7 @@ func (c *ExcelInfoController) List() {
 	}
 	//获取表格信息
 	list, err := excel3.GetNoContentExcelListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取表格信息失败"
 		br.ErrMsg = "获取表格信息失败,Err:" + err.Error()
@@ -573,7 +573,7 @@ func (c *ExcelInfoController) List() {
 	}
 
 	lenList := len(list)
-	if list == nil || lenList <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || lenList <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		list = make([]*excel3.MyExcelInfoList, 0)
 	}
 
@@ -634,7 +634,7 @@ func (c *ExcelInfoController) List() {
 
 	// 总数据量
 	dataCount, err := excel3.GetExcelListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取表格列表信息失败"
 		br.ErrMsg = "获取表格列表数据总数失败,Err:" + err.Error()
 		return
@@ -1185,7 +1185,7 @@ func (c *ExcelInfoController) Move() {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取分类信息失败" + err.Error()
 
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类已被删除,不可移动,请刷新页面"
 				br.ErrMsg = "分类已被删除,不可移动,请刷新页面"
 				br.IsSendEmail = false
@@ -1394,7 +1394,7 @@ func (c *ExcelInfoController) Delete() {
 		condition += " AND sort>=? "
 		pars = append(pars, excelInfo.Sort)
 		nextItem, err = excel3.GetNextExcelInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级表格信息失败,Err:" + err.Error()
 			return
@@ -1403,7 +1403,7 @@ func (c *ExcelInfoController) Delete() {
 		// 如果没找到,那么查找下一个分类的第一个表格
 		if nextItem == nil {
 			currClassifyInfo, err := excel3.GetExcelClassifyById(excelInfo.ExcelClassifyId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取当前表格分类信息失败,Err:" + err.Error()
 				return
@@ -1432,7 +1432,7 @@ func (c *ExcelInfoController) Delete() {
 			//}
 
 			nextItem, err = excel3.GetNextExcelInfo(excelInfo.ExcelClassifyId, currClassifyInfo.Sort, currClassifyInfo.Source)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级表格信息失败,Err:" + err.Error()
 				return
@@ -1507,7 +1507,7 @@ func (c *ExcelInfoController) AddDraft() {
 
 	excelClassify, err := excel3.GetExcelClassifyById(req.ExcelClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			br.IsSendEmail = false
@@ -1606,7 +1606,7 @@ func (c *ExcelInfoController) GetExcelTableData() {
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取ETA表格信息失败,Err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "ETA表格被删除,请刷新页面"
 			br.ErrMsg = "ETA表格被删除,请刷新页面,Err:" + err.Error()
 			br.IsSendEmail = false
@@ -1726,7 +1726,7 @@ func (c *ExcelInfoController) GetExcelTableData() {
 
 	// 获取表格引用
 	reference, err := excel3.GetReferencedExcelConfig(referencedId, fromScene, uniqueCode, uuid)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取表格引用失败,Err:" + err.Error()
 		return
@@ -2638,7 +2638,7 @@ func (c *ExcelInfoController) Download() {
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取ETA表格信息失败,Err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "ETA表格被删除,请刷新页面"
 			br.ErrMsg = "ETA表格被删除,请刷新页面,Err:" + err.Error()
 			br.IsSendEmail = false
@@ -3743,7 +3743,7 @@ func (c *ExcelInfoController) SaveExcelReference() {
 
 	if len(addList) > 0 {
 		err = excel3.AddReferencedExcelConfig(addList)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "添加引用失败"
 			br.ErrMsg = "添加引用失败,Err:" + err.Error()
 			return

+ 1 - 1
controllers/data_manage/fenwei_data.go

@@ -944,7 +944,7 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 
 			var dataList []*data_manage.BaseFromFenweiData
 			dataList, err = data_manage.GetBaseFromFenWeiDataByIndexCode(v.IndexCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.ErrMsg = "GetBaseFromFenWeiDataByIndexCode,Err:" + err.Error()
 				br.Msg = "获取数据失败"
 				return

+ 12 - 12
controllers/data_manage/future_good/future_good_chart_classify.go

@@ -36,7 +36,7 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -67,14 +67,14 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 	}
 
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_FUTURE_GOOD)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoAll([]int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT})
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -108,13 +108,13 @@ func (this *FutureGoodChartClassifyController) ChartClassifyList() {
 // getChartClassifyListForMe 获取我创建的图表
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_FUTURE_GOOD)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, adminInfo.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -307,7 +307,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -369,7 +369,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -393,7 +393,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -455,7 +455,7 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -475,14 +475,14 @@ func (this *FutureGoodChartClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return
@@ -617,7 +617,7 @@ func (this *FutureGoodChartClassifyController) ChartClassifyMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartClassifyByParentId(chartClassifyInfo.ParentId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return

+ 36 - 36
controllers/data_manage/future_good/future_good_chart_info.go

@@ -82,7 +82,7 @@ func (this *FutureGoodChartInfoController) ChartList() {
 
 	if chartClassifyId > 0 {
 		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -123,7 +123,7 @@ func (this *FutureGoodChartInfoController) ChartList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -141,7 +141,7 @@ func (this *FutureGoodChartInfoController) ChartList() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -149,7 +149,7 @@ func (this *FutureGoodChartInfoController) ChartList() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -193,7 +193,7 @@ func (this *FutureGoodChartInfoController) ChartList() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -204,7 +204,7 @@ func (this *FutureGoodChartInfoController) ChartList() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -254,7 +254,7 @@ func (this *FutureGoodChartInfoController) ChartInfoSave() {
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面!"
 			br.ErrMsg = "图表已被删除,请刷新页面,ChartInfoId:" + strconv.Itoa(req.ChartInfoId)
 			return
@@ -363,7 +363,7 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -405,7 +405,7 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 		if v.Source == utils.CHART_SOURCE_DEFAULT { //ETA指标
 			edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "指标不存在!"
 					br.ErrMsg = "指标不存在,edbInfoId:" + strconv.Itoa(edbInfoId)
 					return
@@ -433,7 +433,7 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 		} else { // 商品指标
 			edbInfo, err := future_good.GetFutureGoodEdbInfo(edbInfoId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "指标不存在!"
 					br.ErrMsg = "指标不存在,edbInfoId:" + strconv.Itoa(edbInfoId)
 					return
@@ -648,7 +648,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdit() {
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -664,7 +664,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdit() {
 	}
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -726,7 +726,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdit() {
 		if v.Source == utils.CHART_SOURCE_DEFAULT { //ETA指标
 			edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "图表不存在!"
 					br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoId)
 					return
@@ -746,7 +746,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdit() {
 		} else { //商品指标
 			edbInfo, err := future_good.GetFutureGoodEdbInfo(edbInfoId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "指标不存在!"
 					br.ErrMsg = "指标不存在,edbInfoId:" + strconv.Itoa(edbInfoId)
 					return
@@ -862,7 +862,7 @@ func (this *FutureGoodChartInfoController) ChartEnInfoEdit() {
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -896,7 +896,7 @@ func (this *FutureGoodChartInfoController) ChartEnInfoEdit() {
 	//校验指标信息是否存在
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoMapping.EdbInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表不存在!"
 			br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
 			return
@@ -926,7 +926,7 @@ func (this *FutureGoodChartInfoController) ChartEnInfoEdit() {
 
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return
@@ -951,7 +951,7 @@ func (this *FutureGoodChartInfoController) ChartEnInfoEdit() {
 			}
 			futureGoodEdbInfo, err := future_good.GetFutureGoodEdbInfo(futureGoodEdbInfoMapping.EdbInfoId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "图表不存在!"
 					br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(edbInfoMapping.EdbInfoId)
 					return
@@ -1040,7 +1040,7 @@ func (this *FutureGoodChartInfoController) ChartInfoNewest() {
 		this.ServeJSON()
 	}()
 	item, err := data_manage.GetChartInfoByNewest(2)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取最新图表失败"
 		br.ErrMsg = "获取最新图表失败,Err:" + err.Error()
 		return
@@ -1113,7 +1113,7 @@ func (this *FutureGoodChartInfoController) ChartInfoMove() {
 	if chartInfo.ChartClassifyId != req.ChartClassifyId {
 		//查询需要修改的分类下是否存在同一个图表名称
 		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
@@ -1172,7 +1172,7 @@ func (this *FutureGoodChartInfoController) ChartInfoMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -1284,7 +1284,7 @@ func (this *FutureGoodChartInfoController) ChartInfoDetail() {
 	if chartInfoId > 0 {
 		chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图被删除,请刷新页面"
 				br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 				return
@@ -1328,7 +1328,7 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 	}
 	futureGoodEdbInfoMapping, err = data_manage.GetFutureGoodEdbChartEdbMapping(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "期货指标不存在"
 			return
 		}
@@ -1462,7 +1462,7 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -1535,7 +1535,7 @@ func (this *FutureGoodChartInfoController) ChartInfoDetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -1589,7 +1589,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -1831,7 +1831,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -2173,7 +2173,7 @@ func (this *FutureGoodChartInfoController) BaseChartInfoDetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -2304,7 +2304,7 @@ func (this *FutureGoodChartInfoController) BaseChartInfoDetailFromUniqueCode() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -2400,7 +2400,7 @@ func (this *FutureGoodChartInfoController) ChartInfoSearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -2414,7 +2414,7 @@ func (this *FutureGoodChartInfoController) ChartInfoSearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, []int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, []int{utils.CHART_SOURCE_FUTURE_GOOD, utils.CHART_SOURCE_FUTURE_GOOD_PROFIT}, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -2513,7 +2513,7 @@ func (this *FutureGoodChartInfoController) ChartInfoRefresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -2893,7 +2893,7 @@ func copyChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId int, cha
 	}
 	chartClassify, err := data_manage.GetChartClassifyById(chartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -3218,7 +3218,7 @@ func (this *FutureGoodChartInfoController) BaseInfoEdit() {
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -3255,7 +3255,7 @@ func (this *FutureGoodChartInfoController) BaseInfoEdit() {
 	//校验指标信息是否存在
 	edbInfoList, err := data_manage.GetEdbInfoByIdList(edbIds)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表不存在!"
 			br.ErrMsg = "图表指标不存在,ChartInfoId:" + strconv.Itoa(req.ChartInfoId)
 			return
@@ -3330,7 +3330,7 @@ func (this *FutureGoodChartInfoController) BaseInfoEdit() {
 
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return

+ 6 - 6
controllers/data_manage/future_good/future_good_edb_info.go

@@ -60,7 +60,7 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoList() {
 	}
 
 	list, err := future_good2.GetFutureGoodEdbInfoList(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -141,14 +141,14 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 	}
 
 	total, err := future_good2.GetFutureGoodEdbDataListCount(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	list, err := future_good2.GetFutureGoodEdbDataList(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -156,7 +156,7 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoDataList() {
 
 	// 获取用到的指标信息
 	futureGoodEdbInfoList, err := future_good2.GetAllFutureGoodEdbInfoList()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -219,7 +219,7 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbInfoGroupList() {
 	}
 
 	list, err := future_good2.GetFutureGoodEdbInfoGroupList(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -320,7 +320,7 @@ func (this *FutureGoodEdbInfoController) FutureGoodEdbExchangeList() {
 	}
 
 	list, err := future_good2.GetFutureGoodEdbExchangeList(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 7 - 7
controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -73,7 +73,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -397,7 +397,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -413,7 +413,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 	}
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -713,7 +713,7 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 	}
 	chartClassify, err := data_manage.GetChartClassifyById(chartClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			br.ErrMsg = "分类不存在"
 			return
@@ -1124,7 +1124,7 @@ func getFutureGoodProfitChartInfo(chartInfo *data_manage.ChartInfoView, sysUser
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -1188,7 +1188,7 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -1387,7 +1387,7 @@ func GetFutureGoodProfitChartInfoDetailFromUniqueCode(chartInfo *data_manage.Cha
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err: " + err.Error()
 				return

+ 5 - 5
controllers/data_manage/gpr_risk_data.go

@@ -44,7 +44,7 @@ func (this *BaseFromGprRiskController) GprRiskClassify() {
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromGprRiskClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -355,7 +355,7 @@ func (this *BaseFromGprRiskController) GprRiskSingleData() {
 		return
 	}
 	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_GPR_RISK, indexCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据源失败"
 		br.ErrMsg = "获取数据源失败,Err:" + err.Error()
 		return
@@ -405,7 +405,7 @@ func (this *BaseFromGprRiskController) GprRiskIndexList() {
 	}()
 	classifyId, _ := this.GetInt("ClassifyId", 0)
 	indexList, err := data_manage.GetGprRiskIndexByClassifyId(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -489,7 +489,7 @@ func (this *BaseFromGprRiskController) GprRiskNameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_GPR_RISK, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 			return
@@ -792,7 +792,7 @@ func (this *BaseFromGprRiskController) ExportGprRiskList() {
 	if classifyId > 0 {
 		classifyInfo, err := data_manage.GetBaseFromGprRiskClassifyById(classifyId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类不存在"
 				return
 			}

+ 12 - 12
controllers/data_manage/line_equation/line_chart_classify.go

@@ -36,7 +36,7 @@ func (this *LineEquationChartClassifyController) ChartClassifyList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -64,14 +64,14 @@ func (this *LineEquationChartClassifyController) ChartClassifyList() {
 	source := utils.CHART_SOURCE_LINE_EQUATION
 
 	rootList, err := data_manage.GetChartClassifyByParentId(0, source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoAll([]int{source})
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -113,14 +113,14 @@ func (this *LineEquationChartClassifyController) ChartClassifyList() {
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	// 获取所有的分类
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_LINE_EQUATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	// /获取所有的图表
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_LINE_EQUATION}, adminInfo.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -312,7 +312,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -374,7 +374,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -398,7 +398,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -461,7 +461,7 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -481,14 +481,14 @@ func (this *LineEquationChartClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return
@@ -623,7 +623,7 @@ func (this *LineEquationChartClassifyController) ChartClassifyMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartClassifyByParentId(chartClassifyInfo.ParentId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return

+ 21 - 21
controllers/data_manage/line_equation/line_chart_info.go

@@ -413,7 +413,7 @@ func (this *LineEquationChartInfoController) Move() {
 	if chartInfo.ChartClassifyId != req.ChartClassifyId {
 		//查询需要修改的分类下是否存在同一个图表名称
 		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
@@ -472,7 +472,7 @@ func (this *LineEquationChartInfoController) Move() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -588,7 +588,7 @@ func (this *LineEquationChartInfoController) List() {
 
 	if chartClassifyId > 0 {
 		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -628,7 +628,7 @@ func (this *LineEquationChartInfoController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -646,7 +646,7 @@ func (this *LineEquationChartInfoController) List() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -654,7 +654,7 @@ func (this *LineEquationChartInfoController) List() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -698,7 +698,7 @@ func (this *LineEquationChartInfoController) List() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -709,7 +709,7 @@ func (this *LineEquationChartInfoController) List() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -760,7 +760,7 @@ func (this *LineEquationChartInfoController) Detail() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -834,7 +834,7 @@ func (this *LineEquationChartInfoController) Detail() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -962,7 +962,7 @@ func (this *LineEquationChartInfoController) DetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -1000,7 +1000,7 @@ func (this *LineEquationChartInfoController) DetailFromUniqueCode() {
 					myCond += ` AND a.chart_info_id=? `
 					myPars = append(myPars, chartInfo.ChartInfoId)
 					myList, err := data_manage.GetMyChartByCondition(myCond, myPars)
-					if err != nil && err.Error() != utils.ErrNoRow() {
+					if err != nil && !utils.IsErrNoRow(err) {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 						return
@@ -1076,7 +1076,7 @@ func (this *LineEquationChartInfoController) Refresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -1236,7 +1236,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -1400,7 +1400,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -1496,7 +1496,7 @@ func (this *LineEquationChartInfoController) EnInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -1514,7 +1514,7 @@ func (this *LineEquationChartInfoController) EnInfoEdit() {
 		pars = append(pars, req.ChartInfoId, req.ChartNameEn, utils.CHART_SOURCE_LINE_EQUATION)
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return
@@ -1623,7 +1623,7 @@ func (this *LineEquationChartInfoController) SearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1637,7 +1637,7 @@ func (this *LineEquationChartInfoController) SearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -1739,7 +1739,7 @@ func (this *LineEquationChartInfoController) BaseInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -1764,7 +1764,7 @@ func (this *LineEquationChartInfoController) BaseInfoEdit() {
 		pars = append(pars, req.ChartName)
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return

+ 29 - 29
controllers/data_manage/line_feature/chart_info.go

@@ -65,7 +65,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSave() {
 	if err != nil {
 		br.Msg = "指标A异常"
 		br.ErrMsg = "指标A异常,err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = `指标A不存在`
 			br.IsSendEmail = false
 		}
@@ -554,7 +554,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveChart() {
 	}
 
 	multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByIdAndSource(req.MultipleGraphConfigId, req.Source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -567,7 +567,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveChart() {
 		isAdd = true
 	} else {
 		chartInfo, err := data_manage.GetChartInfoById(multipleGraphConfigChartMapping.ChartInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = `保存失败`
 			br.ErrMsg = "获取图表信息失败,ERR:" + err.Error()
 			return
@@ -866,7 +866,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 	}
 
 	multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByIdAndSource(req.MultipleGraphConfigId, req.Source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -874,7 +874,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 
 	// 原图
 	oldChartInfo, err := data_manage.GetChartInfoById(multipleGraphConfigChartMapping.ChartInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取图表信息失败,ERR:" + err.Error()
 		return
@@ -1064,7 +1064,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveEdb() {
 	}
 
 	multipleGraphConfigEdbMapping, err := data_manage.GetMultipleGraphConfigEdbMappingByIdAndSource(req.MultipleGraphConfigId, req.Source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -1076,7 +1076,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveEdb() {
 		isAdd = true
 	} else {
 		edbInfo, err := data_manage.GetEdbInfoById(multipleGraphConfigEdbMapping.EdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = `保存失败`
 			br.ErrMsg = "获取图表信息失败,ERR:" + err.Error()
 			return
@@ -1463,7 +1463,7 @@ func (this *LineFeaturesChartInfoController) Move() {
 	if chartInfo.ChartClassifyId != req.ChartClassifyId {
 		//查询需要修改的分类下是否存在同一个图表名称
 		tmpChartInfo, tmpErr := data_manage.GetChartInfoByClassifyIdAndName(req.ChartClassifyId, chartInfo.ChartName)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
 			return
@@ -1522,7 +1522,7 @@ func (this *LineFeaturesChartInfoController) Move() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartInfoByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -1633,7 +1633,7 @@ func (this *LineFeaturesChartInfoController) List() {
 
 	if chartClassifyId > 0 {
 		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -1671,7 +1671,7 @@ func (this *LineFeaturesChartInfoController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1689,7 +1689,7 @@ func (this *LineFeaturesChartInfoController) List() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -1697,7 +1697,7 @@ func (this *LineFeaturesChartInfoController) List() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -1741,7 +1741,7 @@ func (this *LineFeaturesChartInfoController) List() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -1752,7 +1752,7 @@ func (this *LineFeaturesChartInfoController) List() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -1795,7 +1795,7 @@ func (this *LineFeaturesChartInfoController) Detail() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -1930,7 +1930,7 @@ func (this *LineFeaturesChartInfoController) Detail() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -2058,7 +2058,7 @@ func (this *LineFeaturesChartInfoController) DetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -2096,7 +2096,7 @@ func (this *LineFeaturesChartInfoController) DetailFromUniqueCode() {
 					myCond += ` AND a.chart_info_id=? `
 					myPars = append(myPars, chartInfo.ChartInfoId)
 					myList, err := data_manage.GetMyChartByCondition(myCond, myPars)
-					if err != nil && err.Error() != utils.ErrNoRow() {
+					if err != nil && !utils.IsErrNoRow(err) {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 						return
@@ -2172,7 +2172,7 @@ func (this *LineFeaturesChartInfoController) Refresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -2254,7 +2254,7 @@ func (this *LineFeaturesChartInfoController) Copy() {
 	}
 
 	multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByChartId(oldChartInfo.ChartInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -2338,7 +2338,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -2543,7 +2543,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -2639,7 +2639,7 @@ func (this *LineFeaturesChartInfoController) EnInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -2657,7 +2657,7 @@ func (this *LineFeaturesChartInfoController) EnInfoEdit() {
 		pars = append(pars, req.ChartInfoId, req.ChartNameEn, utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY)
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return
@@ -2766,7 +2766,7 @@ func (this *LineFeaturesChartInfoController) SearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -2780,7 +2780,7 @@ func (this *LineFeaturesChartInfoController) SearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -2882,7 +2882,7 @@ func (this *LineFeaturesChartInfoController) BaseInfoEdit() {
 	//判断指标名称是否存在
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面"
 			br.ErrMsg = "图表已被删除,请刷新页面"
 			return
@@ -2908,7 +2908,7 @@ func (this *LineFeaturesChartInfoController) BaseInfoEdit() {
 		pars = append(pars, req.ChartName)
 		existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				br.Msg = "判断英文图表名称是否存在失败"
 				br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 				return

+ 12 - 12
controllers/data_manage/line_feature/classify.go

@@ -36,7 +36,7 @@ func (this *LineFeaturesChartClassifyController) ChartClassifyList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -64,14 +64,14 @@ func (this *LineFeaturesChartClassifyController) ChartClassifyList() {
 	source := utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION
 
 	rootList, err := data_manage.GetChartClassifyByParentId(0, source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoAll([]int{utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY})
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -113,14 +113,14 @@ func (this *LineFeaturesChartClassifyController) ChartClassifyList() {
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	// 获取所有的分类
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	// /获取所有的图表
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_LINE_FEATURE_STANDARD_DEVIATION, utils.CHART_SOURCE_LINE_FEATURE_PERCENTILE, utils.CHART_SOURCE_LINE_FEATURE_FREQUENCY}, adminInfo.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -312,7 +312,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -374,7 +374,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -398,7 +398,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -461,7 +461,7 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -481,14 +481,14 @@ func (this *LineFeaturesChartClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return
@@ -623,7 +623,7 @@ func (this *LineFeaturesChartClassifyController) ChartClassifyMove() {
 
 	} else {
 		firstClassify, err := data_manage.GetFirstChartClassifyByParentId(chartClassifyInfo.ParentId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 			return

+ 6 - 6
controllers/data_manage/manual.go

@@ -2,13 +2,13 @@ package data_manage
 
 import (
 	"encoding/json"
-	"fmt"
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -224,7 +224,7 @@ func (this *ChartClassifyController) AddManualClassify() {
 	}
 
 	classifyItem, err := data_manage.GetManualClassifyByClassifyName(req.ClassifyName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "判断名称是否已存在失败"
 		br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 		return
@@ -315,7 +315,7 @@ func (this *ChartClassifyController) ManualClassifyEdit() {
 		return
 	}
 	classifyItem, err := data_manage.GetManualClassifyByClassifyName(req.ClassifyName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "修改失败"
 		br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 		return
@@ -364,7 +364,7 @@ func (this *ChartClassifyController) ManualClassifyDel() {
 		return
 	}
 	classifyItem, err := data_manage.GetManualClassifyById(req.ClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "查找分类失败"
 		br.ErrMsg = "查找分类失败,Err:" + err.Error()
 		return
@@ -377,7 +377,7 @@ func (this *ChartClassifyController) ManualClassifyDel() {
 
 	// 获取当前分类下是否存在子分类
 	count, err := data_manage.GetChildManualClassifyCount(req.ClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "删除失败"
 		br.ErrMsg = "根据分类id获取下面存在的子分类数量失败,Err:" + err.Error()
 		return
@@ -391,7 +391,7 @@ func (this *ChartClassifyController) ManualClassifyDel() {
 	if classifyItem.ParentId > 0 {
 		// 获取当前分类下的指标数
 		count, err = data_manage.GetManualEdbInfoCountByClassifyId(req.ClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "根据分类id获取下面存在的指标数量失败,Err:" + err.Error()
 			return

+ 8 - 8
controllers/data_manage/multiple_graph_config.go

@@ -61,7 +61,7 @@ func (this *ChartInfoController) MultipleGraphConfigSave() {
 	if err != nil {
 		br.Msg = "指标A异常"
 		br.ErrMsg = "指标A异常,err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = `指标A不存在`
 			br.IsSendEmail = false
 		}
@@ -81,7 +81,7 @@ func (this *ChartInfoController) MultipleGraphConfigSave() {
 	if err != nil {
 		br.Msg = "指标B异常"
 		br.ErrMsg = "指标B异常,err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = `指标B不存在`
 			br.IsSendEmail = false
 		}
@@ -676,7 +676,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 	}
 
 	multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByIdAndSource(req.MultipleGraphConfigId, req.Source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -689,7 +689,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 		isAdd = true
 	} else {
 		chartInfo, err := data_manage.GetChartInfoById(multipleGraphConfigChartMapping.ChartInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = `保存失败`
 			br.ErrMsg = "获取图表信息失败,ERR:" + err.Error()
 			return
@@ -1018,7 +1018,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 	}
 
 	multipleGraphConfigChartMapping, err := data_manage.GetMultipleGraphConfigChartMappingByIdAndSource(req.MultipleGraphConfigId, req.Source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -1026,7 +1026,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 
 	// 原图
 	oldChartInfo, err := data_manage.GetChartInfoById(multipleGraphConfigChartMapping.ChartInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取图表信息失败,ERR:" + err.Error()
 		return
@@ -1275,7 +1275,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveEdb() {
 	}
 
 	multipleGraphConfigEdbMapping, err := data_manage.GetMultipleGraphConfigEdbMappingByIdAndSource(req.MultipleGraphConfigId, req.Source)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = `保存失败`
 		br.ErrMsg = "获取配置与图表的关联关系失败,ERR:" + err.Error()
 		return
@@ -1287,7 +1287,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveEdb() {
 		isAdd = true
 	} else {
 		edbInfo, err := data_manage.GetEdbInfoById(multipleGraphConfigEdbMapping.EdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = `保存失败`
 			br.ErrMsg = "获取图表信息失败,ERR:" + err.Error()
 			return

+ 32 - 32
controllers/data_manage/my_chart.go

@@ -129,7 +129,7 @@ func (this *MyChartController) ChartList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -147,7 +147,7 @@ func (this *MyChartController) ChartList() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -155,7 +155,7 @@ func (this *MyChartController) ChartList() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -232,7 +232,7 @@ func (this *MyChartController) ChartList() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -243,7 +243,7 @@ func (this *MyChartController) ChartList() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -278,7 +278,7 @@ func (this *MyChartController) ClassifyList() {
 	}
 	//获取图表信息
 	list, err := data_manage.GetMyChartClassifyAll(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取分类信息失败"
 		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
@@ -286,7 +286,7 @@ func (this *MyChartController) ClassifyList() {
 	}
 
 	resp := new(data_manage.MyChartClassifyResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.MyChartClassifyItem, 0)
 		resp.List = items
 		br.Ret = 200
@@ -458,7 +458,7 @@ func (this *MyChartController) ClassifyEdit() {
 		return
 	}
 	item, err := data_manage.GetMyChartClassifyById(sysUser.AdminId, req.MyChartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "保存失败"
 		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
 		return
@@ -546,7 +546,7 @@ func (this *MyChartController) ClassifyMove() {
 	}
 	//查询该分类存不存在
 	item, err := data_manage.GetMyChartClassifyById(sysUser.AdminId, req.MyChartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "移动失败,找不到该分类"
 		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
 		return
@@ -596,7 +596,7 @@ func (this *MyChartController) ClassifyMove() {
 		updateCol = append(updateCol, "Sort", "ModifyTime")
 	} else {
 		firstClassify, err := data_manage.GetFirstMyChartClassifyByAdminId(sysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "移动失败"
 			br.ErrMsg = "获取获取当前账号下的排序第一条的分类信息失败,Err:" + err.Error()
 			return
@@ -670,7 +670,7 @@ func (this *MyChartController) ClassifyDelete() {
 	}
 
 	item, err := data_manage.GetMyChartClassifyById(sysUser.AdminId, req.MyChartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "保存失败"
 		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
 		return
@@ -769,7 +769,7 @@ func (this *MyChartController) MyChartAdd() {
 	}
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败!"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -790,7 +790,7 @@ func (this *MyChartController) MyChartAdd() {
 	pars = append(pars, req.ChartInfoId)
 
 	existItem, err := data_manage.GetMyChartDetailByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,校验名称是否存在失败,Err:" + err.Error()
 		return
@@ -910,7 +910,7 @@ func (this *MyChartController) MyChartAddToClassify() {
 	}
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败!"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
@@ -931,7 +931,7 @@ func (this *MyChartController) MyChartAddToClassify() {
 	pars = append(pars, req.ChartInfoId)
 
 	existItem, err := data_manage.GetMyChartDetailByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,校验名称是否存在失败,Err:" + err.Error()
 		return
@@ -1053,7 +1053,7 @@ func (this *MyChartController) GetMyChartClassifyIdList() {
 	existItem, _ := data_manage.GetMyChartDetailByCondition(condition, pars)
 	if existItem != nil {
 		myChartClassifyList, err := data_manage.GetMyChartClassifyList(existItem.MyChartId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败!"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -1308,7 +1308,7 @@ func (this *MyChartController) MyChartList() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1326,14 +1326,14 @@ func (this *MyChartController) MyChartList() {
 
 	//获取图表信息
 	list, err := data_manage.GetMyChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return
 	}
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -1408,7 +1408,7 @@ func (this *MyChartController) MyChartList() {
 	}
 
 	resp := new(data_manage.MyChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.MyChartList, 0)
 		resp.Paging = page
 		resp.List = items
@@ -1418,7 +1418,7 @@ func (this *MyChartController) MyChartList() {
 		return
 	}
 	total, err = data_manage.GetMyChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取我的图表数据总数失败,Err:" + err.Error()
 		return
@@ -1599,7 +1599,7 @@ func (this *MyChartController) ChartRecommendList() {
 
 	//获取图表信息
 	list, err := data_manage.GetRecommendChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -1607,7 +1607,7 @@ func (this *MyChartController) ChartRecommendList() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -1658,7 +1658,7 @@ func (this *MyChartController) ChartRecommendList() {
 	}
 
 	resp := new(data_manage.ChartRecommendListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.List = items
 		br.Ret = 200
@@ -1707,7 +1707,7 @@ func (this *MyChartController) MyChartSearch() {
 
 	//获取图表信息
 	list, err := data_manage.GetMyChartSearchByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -1802,7 +1802,7 @@ func (this *MyChartController) MyChartSearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1919,7 +1919,7 @@ func (this *MyChartController) PublicClassifyList() {
 	}
 	//获取图表信息
 	list, err := data_manage.GetPublicChartClassifyAllExceptMy(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取公共分类信息失败"
 		br.ErrMsg = "获取公共分类信息失败,Err:" + err.Error()
@@ -1927,7 +1927,7 @@ func (this *MyChartController) PublicClassifyList() {
 	}
 
 	resp := new(data_manage.PublicChartClassifyResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		resp.List = make([]data_manage.PublicChartClassifyList, 0)
 		br.Ret = 200
 		br.Success = true
@@ -2036,7 +2036,7 @@ func (this *MyChartController) ModifyClassifyPublicStatus() {
 	}
 	//查询该分类存不存在
 	item, err := data_manage.GetMyChartClassifyById(sysUser.AdminId, req.MyChartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "修改失败,找不到该分类"
 		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
 		return
@@ -2108,7 +2108,7 @@ func (this *MyChartController) CopyClassifyAndChart() {
 	}
 	//查询该公共分类存不存在
 	item, err := data_manage.GetPublicMyChartClassifyById(req.MyChartClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "复制失败,找不到该分类"
 		br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
 		return
@@ -2263,7 +2263,7 @@ func (this *MyChartController) CompanyPublicClassifyList() {
 		pars = append(pars, keyword)
 	}
 	list, err := data_manage.GetCompanyPublicClassifyList(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取用户可见分类列表失败"
 		br.ErrMsg = "获取用户可见分类列表失败, Err:" + err.Error()
@@ -2271,7 +2271,7 @@ func (this *MyChartController) CompanyPublicClassifyList() {
 	}
 
 	resp := new(data_manage.MyChartClassifyResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.MyChartClassifyItem, 0)
 		resp.List = items
 		br.Ret = 200

+ 6 - 6
controllers/data_manage/mysteel_chemical_data.go

@@ -44,14 +44,14 @@ func (this *EdbInfoController) MysteelChemicalClassify() {
 	}
 
 	rootList, err := data_manage.GetBaseFromMysteelChemicalClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromMysteelChemicalClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -113,7 +113,7 @@ func (this *EdbInfoController) MysteelChemicalIndexList() {
 		return
 	}
 	allBaseFromMysteelChemicalIndex, err := data_manage.GetMysteelChemicalIndexByClassifyId(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -594,7 +594,7 @@ func (this *EdbInfoController) MysteelChemicalData() {
 			dataList = make([]*data_manage.MysteelChemicalData, 0)
 		}
 		edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, v.IndexCode)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据失败"
 			br.ErrMsg = "获取指标库统计数据失败,Err:" + err.Error()
 			return
@@ -1327,7 +1327,7 @@ func (c *EdbInfoController) NameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 			return
@@ -1585,7 +1585,7 @@ func (this *EdbInfoController) Add() {
 
 	tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(req.EdbCode)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败,Err:" + err.Error()
 			return

+ 3 - 3
controllers/data_manage/predict_edb_classify.go

@@ -702,7 +702,7 @@ func (this *PredictEdbClassifyController) SimpleList() {
 	}
 
 	rootList, err := data_manage.GetEdbClassifyByParentId(parentId, 1)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -715,7 +715,7 @@ func (this *PredictEdbClassifyController) SimpleList() {
 		// 获取当前账号的不可见指标
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -845,7 +845,7 @@ func (this *PredictEdbClassifyController) ClassifyTree() {
 	}()
 
 	allList, err := data_manage.GetPredictEdbClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 14 - 14
controllers/data_manage/predict_edb_info.go

@@ -104,7 +104,7 @@ func (this *PredictEdbInfoController) EdbChartList() {
 	// 获取当前账号的不可见指标
 	obj := data_manage.EdbInfoNoPermissionAdmin{}
 	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 		return
@@ -120,14 +120,14 @@ func (this *PredictEdbInfoController) EdbChartList() {
 	}
 	//获取指标信息
 	dataCount, list, err := data_manage.GetEdbInfoFilterList(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取预测指标列表失败"
 		br.ErrMsg = "获取预测指标列表失败,Err:" + err.Error()
 		return
 	}
 
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		list = make([]*data_manage.EdbInfoList, 0)
 	} else {
 		classifyIdList := make([]int, 0)
@@ -245,14 +245,14 @@ func (this *PredictEdbInfoController) List() {
 	}
 	//获取指标信息
 	edbInfoItem, err := data_manage.GetEdbInfoByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
 	}
 
-	if edbInfoItem == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if edbInfoItem == nil || (err != nil && utils.IsErrNoRow(err)) {
 		item := new(data_manage.EdbInfoList)
 		resp.Paging = page
 		resp.Item = item
@@ -289,7 +289,7 @@ func (this *PredictEdbInfoController) List() {
 	//获取指标数据(实际已生成)
 	{
 		dataCount, dataList, err := data.GetPageData(edbInfoItem.EdbInfoId, edbInfoItem.Source, edbInfoItem.SubSource, edbInfoItem.LatestDate, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标信息失败"
 			br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 			return
@@ -561,7 +561,7 @@ func (this *PredictEdbInfoController) ChartImageSet() {
 		if err != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "保存失败,Err:" + err.Error()
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "找不到该指标"
 				br.ErrMsg = "找不到该指标"
 				br.IsSendEmail = false
@@ -926,7 +926,7 @@ func (this *PredictEdbInfoController) Detail() {
 	if edbInfo.EdbType == 1 {
 		// 获取所有的指标预测规则配置
 		tmpPredictEdbConfList, err := data_manage.GetPredictEdbConfListById(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取预测指标配置信息失败,Err:" + err.Error()
 			return
@@ -935,7 +935,7 @@ func (this *PredictEdbInfoController) Detail() {
 			var tmpPredictEdbConfCalculateMappingDetail []*data_manage.PredictEdbConfCalculateMappingDetail
 			if v.RuleType == 9 || v.RuleType == 14 {
 				tmpPredictEdbConfCalculateMappingDetail, err = data_manage.GetPredictEdbConfCalculateMappingDetailListByConfigId(v.PredictEdbInfoId, v.ConfigId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取预测指标配置与关联指标信息失败,Err:" + err.Error()
 					return
@@ -1177,7 +1177,7 @@ func (this *PredictEdbInfoController) FilterByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1751,7 +1751,7 @@ func (this *PredictEdbInfoController) ChartDataList() {
 	if err != nil {
 		br.Msg = "获取来源指标信息失败"
 		br.ErrMsg = "获取来源指标信息失败"
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.ErrMsg = "获取来源指标信息失败,Err:" + err.Error()
 		}
 		br.Success = true
@@ -2080,7 +2080,7 @@ func (this *PredictEdbInfoController) ClassifyEdbInfoItems() {
 	// 获取当前账号的不可见指标
 	obj := data_manage.EdbInfoNoPermissionAdmin{}
 	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 		return
@@ -2097,7 +2097,7 @@ func (this *PredictEdbInfoController) ClassifyEdbInfoItems() {
 	}
 
 	allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(classifyId, 1, sysUserId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -2213,7 +2213,7 @@ func (this *PredictEdbInfoController) ChartImageSetBySvg() {
 	if err != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "保存失败,Err:" + err.Error()
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "找不到该指标"
 			br.ErrMsg = "找不到该指标"
 			br.IsSendEmail = false

+ 10 - 10
controllers/data_manage/range_analysis/chart_classify.go

@@ -61,7 +61,7 @@ func (this *RangeChartClassifyController) ChartClassifyList() {
 	nodeAll := make([]*data_manage.ChartClassifyItems, 0)
 	// 查询分类节点
 	rootList, err := data_manage.GetChartClassifyByParentId(parentId, utils.CHART_SOURCE_RANGE_ANALYSIS)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -154,19 +154,19 @@ func (this *RangeChartClassifyController) ChartClassifyList() {
 // getChartClassifyListForMe 获取我创建的图表
 func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartClassifyListResp) (errMsg string, err error) {
 	rootList, err := data_manage.GetChartClassifyByParentId(0, utils.CHART_SOURCE_RANGE_ANALYSIS)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	classifyAll, err := data_manage.GetChartClassifyAll(utils.CHART_SOURCE_RANGE_ANALYSIS)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
 
 	allChartInfo, err := data_manage.GetChartInfoByAdminId([]int{utils.CHART_SOURCE_RANGE_ANALYSIS, utils.CHART_SOURCE_RANGE_ANALYSIS}, adminInfo.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取失败"
 		return
 	}
@@ -366,7 +366,7 @@ func (this *RangeChartClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -428,7 +428,7 @@ func (this *RangeChartClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -452,7 +452,7 @@ func (this *RangeChartClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -550,7 +550,7 @@ func (this *RangeChartClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -570,14 +570,14 @@ func (this *RangeChartClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return

+ 17 - 17
controllers/data_manage/range_analysis/chart_info.go

@@ -336,7 +336,7 @@ func (this *RangeChartChartInfoController) Detail() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -415,7 +415,7 @@ func (this *RangeChartChartInfoController) Detail() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -564,7 +564,7 @@ func (this *RangeChartChartInfoController) DetailFromUniqueCode() {
 	status := true
 	chartInfo, err := data_manage.GetChartInfoViewByUniqueCode(uniqueCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			status = false
 		} else {
 			br.Msg = "获取失败"
@@ -602,7 +602,7 @@ func (this *RangeChartChartInfoController) DetailFromUniqueCode() {
 					myCond += ` AND a.chart_info_id=? `
 					myPars = append(myPars, chartInfo.ChartInfoId)
 					myList, err := data_manage.GetMyChartByCondition(myCond, myPars)
-					if err != nil && err.Error() != utils.ErrNoRow() {
+					if err != nil && !utils.IsErrNoRow(err) {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 						return
@@ -659,7 +659,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 				myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					msg = "获取失败"
 					errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 					return
@@ -826,7 +826,7 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				msg = "获取失败"
 				errMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -937,7 +937,7 @@ func (this *RangeChartChartInfoController) List() {
 
 	if chartClassifyId > 0 {
 		chartClassifyId, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -969,7 +969,7 @@ func (this *RangeChartChartInfoController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -987,7 +987,7 @@ func (this *RangeChartChartInfoController) List() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -995,7 +995,7 @@ func (this *RangeChartChartInfoController) List() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -1039,7 +1039,7 @@ func (this *RangeChartChartInfoController) List() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -1050,7 +1050,7 @@ func (this *RangeChartChartInfoController) List() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -1253,7 +1253,7 @@ func (this *RangeChartChartInfoController) Refresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -1827,7 +1827,7 @@ func (this *RangeChartChartInfoController) SearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1841,7 +1841,7 @@ func (this *RangeChartChartInfoController) SearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -1970,7 +1970,7 @@ func (this *RangeChartChartInfoController) BaseInfoEdit() {
 	pars = append(pars, req.ChartName)
 	existItem, err := data_manage.GetChartInfoByCondition(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "判断英文图表名称是否存在失败"
 			br.ErrMsg = "判断英文图表名称是否存在失败,Err:" + err.Error()
 			return
@@ -2063,7 +2063,7 @@ func (this *RangeChartChartInfoController) ChartInfoSave() {
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面!"
 			br.ErrMsg = "图表已被删除,请刷新页面,ChartInfoId:" + strconv.Itoa(req.ChartInfoId)
 			return

+ 5 - 5
controllers/data_manage/sci_data.go

@@ -36,14 +36,14 @@ func (this *EdbInfoController) SciClassify() {
 	}
 
 	rootList, err := data_manage.GetBaseFromSciClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromSciClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -52,7 +52,7 @@ func (this *EdbInfoController) SciClassify() {
 	baseFromSciIndexMap := make(map[int][]*data_manage.BaseFromSciClassifyItems)
 
 	allBaseFromSciIndex, err := data_manage.GetSciIndexAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -144,14 +144,14 @@ func (this *EdbInfoController) SciClassifyName() {
 	}
 
 	rootList, err := data_manage.GetBaseFromSciClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromSciClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 7 - 7
controllers/data_manage/sci_hq_data.go

@@ -180,7 +180,7 @@ func (this *SciHqDataController) EditClassify() {
 	}
 	classify, err := data_manage.GetSciHqClassifyById(req.ClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}
@@ -295,7 +295,7 @@ func (this *SciHqDataController) IndexList() {
 	}()
 	classifyId, _ := this.GetInt("ClassifyId", 0)
 	indexList, err := data_manage.GetSciHqIndexBaseInfoByClassifyId(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -429,7 +429,7 @@ func (this *SciHqDataController) IndexPageList() {
 		}
 		total = tmpTotal
 		tmpIndexList, err := data_manage.GetSciHqIndexByPage(startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -457,7 +457,7 @@ func (this *SciHqDataController) IndexPageList() {
 		}
 		total = tmpTotal
 		tmpIndexList, err := data_manage.GetSciHqIndexByClassifyId(classifyIds, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -534,7 +534,7 @@ func (this *SciHqDataController) SingleData() {
 		return
 	}
 	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI_HQ, indexInfo.IndexCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标数据失败"
 		br.ErrMsg = "获取指标库数据失败,Err:" + err.Error()
 		return
@@ -736,7 +736,7 @@ func (this *SciHqDataController) AddEdbInfo() {
 
 	_, err = data_manage.GetSciHqIndexByIndexCode(req.EdbCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "指标不存在"
 			return
 		}
@@ -947,7 +947,7 @@ func (c *SciHqDataController) NameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_SCI_HQ, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取卓创红期已存在信息失败,Err:" + err.Error()
 			return

+ 4 - 4
controllers/data_manage/smm_data.go

@@ -37,14 +37,14 @@ func (this *EdbInfoController) SmmClassify() {
 	}
 
 	rootList, err := data_manage.GetBaseFromSmmClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromSmmClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -196,14 +196,14 @@ func (this *EdbInfoController) SmmClassifyName() {
 	}
 
 	rootList, err := data_manage.GetBaseFromSmmClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromSmmClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 6 - 6
controllers/data_manage/supply_analysis/variety.go

@@ -76,7 +76,7 @@ func (this *VarietyController) List() {
 		}
 		total, list, err = varietyObj.GetListByPage(condition, pars, startSize, pageSize)
 	}
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -146,7 +146,7 @@ func (this *VarietyController) Add() {
 	}
 	varietyName := utils.TrimStr(req.VarietyName)
 	item, err := supply_analysis.GetVarietyByName(varietyName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
@@ -219,7 +219,7 @@ func (this *VarietyController) Edit() {
 	varietyName := utils.TrimStr(req.VarietyName)
 
 	item, err := supply_analysis.GetVarietyByName(varietyName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败,Err:" + err.Error()
 		return
@@ -364,7 +364,7 @@ func (this *VarietyController) Delete() {
 
 	varietyInfo, err := supply_analysis.GetVarietyById(req.VarietyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该品种不存在或已删除"
 			br.IsSendEmail = false
 		} else {
@@ -411,7 +411,7 @@ func (this *VarietyController) Detail() {
 	if err != nil {
 		br.Msg = "查询品种失败"
 		br.ErrMsg = "查询品种失败;ERR:" + err.Error()
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "不存在该品种或该品种已被删除"
 			br.ErrMsg = "不存在该品种或该品种已被删除"
 			br.IsSendEmail = false
@@ -626,7 +626,7 @@ func (this *VarietyController) ModifyProductionDay() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, req.VarietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return

+ 6 - 6
controllers/data_manage/supply_analysis/variety_edb.go

@@ -57,7 +57,7 @@ func (this *VarietyController) EdbList() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, varietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return
@@ -65,7 +65,7 @@ func (this *VarietyController) EdbList() {
 
 	var list []*supply_analysis.VarietyEdbInfoItem
 	list, err = supply_analysis.GetAllVarietyEdbInfoByVarietyId(varietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -206,7 +206,7 @@ func (this *VarietyController) AddToEdb() {
 
 	varietyEdbInfo, err := supply_analysis.GetVarietyEdbInfoByVarietyEdbId(req.VarietyEdbId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "找不到该指标"
 			br.IsSendEmail = false
 		} else {
@@ -219,7 +219,7 @@ func (this *VarietyController) AddToEdb() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, varietyEdbInfo.VarietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return
@@ -232,7 +232,7 @@ func (this *VarietyController) AddToEdb() {
 
 	if varietyEdbInfo.EdbInfoId > 0 {
 		tmpEdbInfo, err := data_manage.GetEdbInfoById(varietyEdbInfo.EdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "添加失败"
 			br.ErrMsg = "查询ETA指标失败,ERR:" + err.Error()
 			return
@@ -347,7 +347,7 @@ func (this *VarietyController) EdbDataExport() {
 
 	var list []*supply_analysis.VarietyEdbInfoItem
 	list, err = supply_analysis.GetAllVarietyEdbInfoByVarietyId(varietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 8 - 8
controllers/data_manage/supply_analysis/variety_plant.go

@@ -50,7 +50,7 @@ func (this *VarietyController) PlantList() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, varietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return
@@ -58,7 +58,7 @@ func (this *VarietyController) PlantList() {
 
 	var list []*supply_analysis.VarietyPlantItem
 	list, err = supply_analysis.GetAllVarietyPlantByVarietyId(varietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -141,7 +141,7 @@ func (this *VarietyController) AddPlant() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, req.VarietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return
@@ -320,7 +320,7 @@ func (this *VarietyController) EditPlant() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, varietyPlantInfo.VarietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return
@@ -443,7 +443,7 @@ func (this *VarietyController) DeletePlant() {
 	}
 
 	varietyPlantInfo, err := supply_analysis.GetVarietyPlantById(req.VarietyPlantId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "删除失败"
 		br.ErrMsg = "查找品种装置失败,Err:" + err.Error()
 		return
@@ -471,7 +471,7 @@ func (this *VarietyController) DeletePlant() {
 	// 是否有装置的操作权限
 	var hasPermission bool
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, varietyPlantInfo.VarietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return
@@ -485,7 +485,7 @@ func (this *VarietyController) DeletePlant() {
 	// 保留一条装置校验
 	{
 		total, err := supply_analysis.GetCountVarietyPlantByVarietyId(varietyInfo.VarietyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "查找品种装置总数量失败,Err:" + err.Error()
 			return
@@ -542,7 +542,7 @@ func (this *VarietyController) CopyPlant() {
 	var hasPermission bool //是否有操作权限
 	// 是否有装置的操作权限
 	hasPermission, err = supply_analysisServ.HasVarietyPlantPermission(this.SysUser, req.VarietyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "查询是否有装置的操作权限失败;ERR:" + err.Error()
 		return

+ 6 - 6
controllers/data_manage/usda_fas_data.go

@@ -44,7 +44,7 @@ func (this *BaseFromUsdaFasController) UsdaFasClassify() {
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromUsdaFasClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -134,7 +134,7 @@ func (this *BaseFromUsdaFasController) UsdaFasIndexData() {
 	if classifyId >= 0 {
 		classifyInfo, err := data_manage.GetBaseFromUsdaFasClassifyById(classifyId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类不存在"
 				return
 			}
@@ -371,7 +371,7 @@ func (this *BaseFromUsdaFasController) UsdaFasSingleData() {
 		return
 	}
 	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_USDA_FAS, indexCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据源失败"
 		br.ErrMsg = "获取数据源失败,Err:" + err.Error()
 		return
@@ -421,7 +421,7 @@ func (this *BaseFromUsdaFasController) UsdaFasIndexList() {
 	}()
 	classifyId, _ := this.GetInt("ClassifyId", 0)
 	indexList, err := data_manage.GetUsdaFasIndexByClassifyId(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -736,7 +736,7 @@ func (this *BaseFromUsdaFasController) UsdaFasNameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_USDA_FAS, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 			return
@@ -1039,7 +1039,7 @@ func (this *BaseFromUsdaFasController) ExportUsdaFasList() {
 	if classifyId > 0 {
 		classifyInfo, err := data_manage.GetBaseFromUsdaFasClassifyById(classifyId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类不存在"
 				return
 			}

+ 4 - 4
controllers/data_manage/wind_data.go

@@ -29,7 +29,7 @@ func (this *EdbInfoController) WindClassify() {
 	parentId, _ := this.GetInt("ParentId")
 	// 特殊处理顶级分类
 	rootList, err := data_manage.GetEdbClassifyByParentId(parentId, 0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -70,7 +70,7 @@ func (this *EdbInfoController) WindClassify() {
 		// 获取当前账号的不可见指标
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -270,7 +270,7 @@ func (this *EdbInfoController) WindEdbInfoList() {
 		if classifyId > 0 { // todo 当没有传入分类ID时,如何处理 同一个分类ID,顶级分类是一样的
 			targetClassify, err := data_manage.GetEdbClassifyById(classifyId)
 			if err != nil {
-				if err.Error() == utils.ErrNoRow() {
+				if utils.IsErrNoRow(err) {
 					br.Msg = "当前分类不存在"
 					return
 				}
@@ -279,7 +279,7 @@ func (this *EdbInfoController) WindEdbInfoList() {
 				return
 			}
 			targetClassifyList, err = data_manage.GetEdbClassifyByRootIdLevel(targetClassify.RootId, targetClassify.ClassifyType, "")
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
 				return

+ 6 - 6
controllers/data_manage/yongyi_data.go

@@ -40,7 +40,7 @@ func (this *EdbInfoController) YongyiClassify() {
 	}
 
 	classifyAll, err := data_manage.GetAllBaseFromYongyiClassify()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -128,7 +128,7 @@ func (this *EdbInfoController) YongyiIndexData() {
 	if classifyId >= 0 {
 		classifyInfo, err := data_manage.GetBaseFromYongyiClassifyById(classifyId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类不存在"
 				return
 			}
@@ -320,7 +320,7 @@ func (this *EdbInfoController) YongyiSingleData() {
 		return
 	}
 	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_YONYI, indexCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据源失败"
 		br.ErrMsg = "获取数据源失败,Err:" + err.Error()
 		return
@@ -370,7 +370,7 @@ func (this *EdbInfoController) YongyiIndexList() {
 	}()
 	classifyId, _ := this.GetInt("ClassifyId", 0)
 	indexList, err := data_manage.GetYongyiIndexByClassifyId(classifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 		return
@@ -660,7 +660,7 @@ func (this *EdbInfoController) YongyiNameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_YONYI, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取钢联已存在信息失败,Err:" + err.Error()
 			return
@@ -962,7 +962,7 @@ func (this *EdbInfoController) ExportYongyiList() {
 	if classifyId > 0 {
 		classifyInfo, err := data_manage.GetBaseFromYongyiClassifyById(classifyId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "分类不存在"
 				return
 			}

+ 1 - 2
controllers/data_source/sci99.go

@@ -103,7 +103,6 @@ func (this *DataSourceController) Sci99Data() {
 		pars = append(pars, "%"+keyword+"%")
 	}
 
-
 	sci99List, err := data_source.GetSci99Index(condition, pars)
 	if err != nil {
 		br.Msg = "获取数据失败"
@@ -122,7 +121,7 @@ func (this *DataSourceController) Sci99Data() {
 		product.ModifyTime = v.ModifyTime
 
 		modifyTime, err := data_source.GetSci99IndexLatestDate(v.IndexCode)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取更新时间失败"
 			br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
 			return

+ 6 - 6
controllers/data_stat/edb_source_stat.go

@@ -225,7 +225,7 @@ func (this *EdbSourceStatController) EdbDeleteLog() {
 	}
 	total, err := data_stat.GetEdbDeleteLogCount(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标删除列表总数失败"
 			br.ErrMsg = "获取指标删除列表总数失败,Err:" + err.Error()
 			return
@@ -378,7 +378,7 @@ func (this *EdbSourceStatController) EdbUpdateLog() {
 	}
 	total, err := data_stat.GetEdbUpdateLogCount(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标删除列表总数失败"
 			br.ErrMsg = "获取指标删除列表总数失败,Err:" + err.Error()
 			return
@@ -555,7 +555,7 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 	}
 	total, err := data_stat.GetEdbUpdateStatCount(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标列表总数失败"
 			br.ErrMsg = "获取指标列表总数失败,Err:" + err.Error()
 			return
@@ -727,7 +727,7 @@ func (this *EdbSourceStatController) EdbSourceStat() {
 	}
 	total, err := data_stat.GetEdbSourceStatCount(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据源统计列表总数失败"
 			br.ErrMsg = "获取数据源统计列表总数失败,Err:" + err.Error()
 			return
@@ -811,7 +811,7 @@ func (this *EdbSourceStatController) EdbUpdateFailedList() {
 	}
 	terminalInfo, err := data_manage.GetEdbTerminalByTerminalCode(terminalCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "终端不存在"
 			return
 		}
@@ -935,7 +935,7 @@ func (this *EdbSourceStatController) EdbUpdateFailedDetailList() {
 
 	total, err := data_stat.GetEdbUpdateStatCount(condition, pars)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "获取指标列表总数失败"
 			br.ErrMsg = "获取指标列表总数失败,Err:" + err.Error()
 			return

+ 1 - 1
controllers/document_manage/document_manage_controller.go

@@ -257,7 +257,7 @@ func (this *DocumentManageController) DocumentRuiSiDetail() {
 
 	reportDetail, err := document_manage_service.DocumentRuiSiDetail(reportId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告已被删除"
 			return
 		}

+ 5 - 5
controllers/english_report/english_classify.go

@@ -206,7 +206,7 @@ func (this *EnglishReportController) AddClassify() {
 	if parentId > 0 {
 		parentClassify, err := models.GetEnglishReportClassifyById(parentId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "上级分类不存在"
 				return
 			}
@@ -331,7 +331,7 @@ func (this *EnglishReportController) EditClassify() {
 
 	oldItem, err := models.GetEnglishReportClassifyById(classifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "当前分类不存在"
 			return
 		}
@@ -350,7 +350,7 @@ func (this *EnglishReportController) EditClassify() {
 	if parentId > 0 {
 		parent, err = models.GetEnglishReportClassifyById(parentId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "上级分类不存在"
 				return
 			}
@@ -482,7 +482,7 @@ func (this *EnglishReportController) DelClassify() {
 
 	classifyInfo, err := models.GetEnglishReportClassifyById(classifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "当前分类不存在"
 			br.ErrMsg = "当前分类不存在"
 			return
@@ -754,7 +754,7 @@ func (this *EnglishReportController) SetEnabled() {
 	}
 	item, err := models.GetEnglishReportClassifyById(req.ClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}

+ 5 - 5
controllers/english_report/english_video.go

@@ -2,12 +2,12 @@ package english_report
 
 import (
 	"encoding/json"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
 	"eta/eta_api/models/company"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 )
@@ -251,7 +251,7 @@ func (this *EnglishVideoController) Detail() {
 	}
 	item, err := models.GetEnglishVideoById(id)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "路演视频不存在"
 			return
 		}
@@ -408,7 +408,7 @@ func (this *EnglishVideoController) PublishVideo() {
 	}
 	videoInfo, err := models.GetEnglishVideoById(id)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "路演视频不存在"
 			return
 		}
@@ -474,7 +474,7 @@ func (this *EnglishVideoController) PublishCancleVideo() {
 	}
 	videoInfo, err := models.GetEnglishVideoById(req.Id)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "路演视频不存在"
 			return
 		}
@@ -526,7 +526,7 @@ func (this *EnglishVideoController) Delete() {
 	}
 	videoInfo, err := models.GetEnglishVideoById(req.Id)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "路演视频不存在"
 			return
 		}

+ 1 - 1
controllers/english_report/policy_report.go

@@ -39,7 +39,7 @@ func (this *EnglishPolicyReportController) Detail() {
 	}
 	item, err := models.GetEnglishPolicyReportById(reportId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告不存在!"
 			return
 		}

+ 4 - 4
controllers/english_report/report.go

@@ -337,7 +337,7 @@ func (this *EnglishReportController) Detail() {
 	}
 	item, err := models.GetEnglishReportById(reportId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告已被删除"
 			return
 		}
@@ -926,7 +926,7 @@ func (this *EnglishReportController) Delete() {
 	}
 	reportInfo, err := models.GetEnglishReportById(req.ReportIds)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告不存在"
 			return
 		}
@@ -1071,7 +1071,7 @@ func (this *EnglishReportController) ClassifyIdDetail() {
 		classifyIdSecond, _ = this.GetInt("ClassifyIdSecond")
 	}
 	item, err := models.GetEnglishReportDetailByClassifyId(classifyIdFirst, classifyIdSecond)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败!"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -1251,7 +1251,7 @@ func (this *EnglishReportController) EditPolicy() {
 	//查询报告是否存在
 	reportInfo, err := models.GetEnglishReportItemById(int(req.ReportId))
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告不存在"
 			return
 		}

+ 8 - 10
controllers/hisugar_data.go

@@ -446,7 +446,7 @@ func (c *TradeCommonController) HisugarNameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_HISUGAR, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取泛糖科技已存在信息失败,Err:" + err.Error()
 			return
@@ -690,8 +690,8 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		if classifyIds != ""{
-			condition += ` AND classify_id IN (`+ classifyIds +`)`
+		if classifyIds != "" {
+			condition += ` AND classify_id IN (` + classifyIds + `)`
 		}
 	}
 	frequencies, err := data_manage.GetHisugarFrequencyByCondition(condition, pars)
@@ -721,7 +721,7 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 			return
 		}
 
-		sheetNew, err := xlsxFile.AddSheet(*frequency+frequencyMap[*frequency])
+		sheetNew, err := xlsxFile.AddSheet(*frequency + frequencyMap[*frequency])
 		if err != nil {
 			fmt.Println("新增Sheet失败", err.Error())
 			return
@@ -911,8 +911,8 @@ func (this *TradeCommonController) HisugarIndexData() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		if classifyIds != ""{
-			condition += ` AND classify_id IN (`+ classifyIds +`)`
+		if classifyIds != "" {
+			condition += ` AND classify_id IN (` + classifyIds + `)`
 		}
 	}
 
@@ -1058,7 +1058,6 @@ func (this *TradeCommonController) GetHisugarIndexInfo() {
 	br.Data = indexInfoPage
 }
 
-
 // FrequencyList
 // @Title 指标频度列表
 // @Description 指标频度列表
@@ -1092,12 +1091,11 @@ func (this *TradeCommonController) FrequencyList() {
 			br.ErrMsg = "获取数据失败,Err:" + err.Error()
 			return
 		}
-		if classifyIds != ""{
-			condition += ` AND classify_id IN (`+ classifyIds +`)`
+		if classifyIds != "" {
+			condition += ` AND classify_id IN (` + classifyIds + `)`
 		}
 	}
 
-
 	frequencies, err := data_manage.GetHisugarFrequencyByCondition(condition, pars)
 	if err != nil {
 		fmt.Println("GetSciFrequency err:", err.Error())

+ 15 - 15
controllers/material/material.go

@@ -158,7 +158,7 @@ func (this *MaterialController) EditMaterialClassify() {
 	// 只允许修改分类名称
 	item, err := material.GetMaterialClassifyById(req.ClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}
@@ -404,7 +404,7 @@ func (this *MaterialController) DeleteMaterialClassify() {
 	/*if req.MaterialId > 0 {
 		materialInfo, err := material.GetMaterialById(req.MaterialId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "素材库已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -466,7 +466,7 @@ func (this *MaterialController) ClassifyMove() {
 	//判断分类是否存在
 	materialClassifyInfo, err := material.GetMaterialClassifyById(req.ClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在,请刷新页面"
 			br.ErrMsg = "分类不存在,Err:" + err.Error()
 			return
@@ -818,7 +818,7 @@ func (this *MaterialController) List() {
 
 	//获取图表信息
 	list, err := material.GetMaterialListPageByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取素材库信息失败"
 		br.ErrMsg = "获取素材库信息失败,Err:" + err.Error()
@@ -826,7 +826,7 @@ func (this *MaterialController) List() {
 	}
 
 	resp := new(material.MaterialListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*material.MaterialListItems, 0)
 		resp.Paging = page
 		resp.List = items
@@ -838,7 +838,7 @@ func (this *MaterialController) List() {
 	}
 
 	dataCount, err := material.GetMaterialListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -891,7 +891,7 @@ func (this *MaterialController) SaveAsMaterial() {
 		// 判断名称是否重复
 		exist, err = material.GetMaterialByName(req.MaterialName)
 	}
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1206,14 +1206,14 @@ func (this *MaterialController) MaterialClassifyList() {
 	resp := new(material.MaterialClassifyListResp)
 
 	rootList, err := material.GetMaterialClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := material.GetMaterialClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1475,7 +1475,7 @@ func (this *MaterialController) BatchChangeClassify() {
 	// 判断新分类是否存在
 	_, err = material.GetMaterialClassifyById(req.NewClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}
@@ -1534,7 +1534,7 @@ func (this *MaterialController) ChangeClassify() {
 	// 判断素材是否存在
 	info, err := material.GetMaterialById(req.MaterialId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "素材不存在"
 			return
 		}
@@ -1551,7 +1551,7 @@ func (this *MaterialController) ChangeClassify() {
 	// 判断新分类是否存在
 	_, err = material.GetMaterialClassifyById(req.NewClassifyId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "分类不存在"
 			return
 		}
@@ -1613,7 +1613,7 @@ func (this *MaterialController) Rename() {
 	// 判断素材是否存在
 	info, err := material.GetMaterialById(req.MaterialId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "素材不存在"
 			return
 		}
@@ -1643,7 +1643,7 @@ func (this *MaterialController) Rename() {
 		info.MaterialName = req.MaterialName
 		updateStr = append(updateStr, "MaterialName")
 	}
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1844,7 +1844,7 @@ func (this *MaterialController) Download() {
 	// 判断素材是否存在
 	info, err := material.GetMaterialById(materialId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "素材不存在"
 			return
 		}

+ 2 - 5
controllers/meeting_probabilities.go

@@ -43,7 +43,7 @@ func (c *MeetingProbabilitiesController) Detail() {
 	// 获取数据详情bu
 	excelDetail, err := models.GetMeetingInfoById(date)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Ret = 200
 			br.Msg = "该日期无数据"
 			br.Msg = "该日期无数据,Err:" + err.Error()
@@ -57,11 +57,10 @@ func (c *MeetingProbabilitiesController) Detail() {
 		sheet := new(request.ISheet)
 		err = json.Unmarshal([]byte(excelDetail.Content), &sheet)
 
-		MeetingProbabilitiesExport(c,br,sheet)
+		MeetingProbabilitiesExport(c, br, sheet)
 		return
 	}
 
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -87,7 +86,6 @@ func MeetingProbabilitiesExport(this *MeetingProbabilitiesController, br *models
 		return
 	}
 
-
 	for _, v := range sheetReq.Data {
 		addRow := sheet.AddRow()
 		for _, s := range v {
@@ -111,4 +109,3 @@ func MeetingProbabilitiesExport(this *MeetingProbabilitiesController, br *models
 	br.Success = true
 	br.Msg = "success"
 }
-

+ 2 - 5
controllers/oilchem_data.go

@@ -169,7 +169,6 @@ func (this *TradeCommonController) OilchemData() {
 	condition += ` AND index_code =? `
 	pars = append(pars, indexCode)
 
-
 	index, err := data_manage.GetOilchemIndexByCode(indexCode)
 	if err != nil {
 		br.Msg = "获取数据失败"
@@ -186,7 +185,6 @@ func (this *TradeCommonController) OilchemData() {
 
 	resp := data_manage.BaseFromOilchemIndexList{}
 
-
 	resp.BaseFromOilchemIndexId = index.BaseFromOilchemIndexId
 	resp.ClassifyId = index.ClassifyId
 	resp.IndexCode = index.IndexCode
@@ -198,7 +196,6 @@ func (this *TradeCommonController) OilchemData() {
 	total, err := data_manage.GetOilchemDataListCount(condition, pars)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
-
 	if len(dataList) > 0 {
 		resp.ModifyTime = dataList[0].ModifyTime
 	}
@@ -444,7 +441,7 @@ func (c *TradeCommonController) NameCheck() {
 			EdbName: v.EdbName,
 		})
 		dataItems, err := data_manage.GetEdbDataAllByEdbCode(v.EdbCode, utils.DATA_SOURCE_OILCHEM, 0, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取隆众资讯已存在信息失败,Err:" + err.Error()
 			return
@@ -810,4 +807,4 @@ func (this *TradeCommonController) ExportoilchemList() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "success"
-}
+}

+ 2 - 2
controllers/out_link.go

@@ -120,7 +120,7 @@ func (ol *OutLinkController) Del() {
 	// 查询
 	err := outLink.GetItemById(req.Id)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该记录已被删除, 请刷新页面"
 			return
 		}
@@ -252,7 +252,7 @@ func (ol *OutLinkController) AllList() {
 	resp := &models.OutLinkListResp{
 		List: respList,
 	}
-	
+
 	if ol.SysUser.AdminName != "" {
 		desEncrypt := utils.DesBase64Encrypt([]byte(ol.SysUser.AdminName), utils.DesKeySalt)
 		resp.UserCode = string(desEncrypt)

+ 5 - 5
controllers/ppt_english.go

@@ -136,7 +136,7 @@ func (this *PptEnglishController) AddPpt() {
 			return
 		}
 		item, err := ppt_english.GetPptEnglishByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据异常!"
 			br.ErrMsg = "获取数据异常,Err:" + err.Error()
 			return
@@ -260,7 +260,7 @@ func (this *PptEnglishController) EditPpt() {
 		return
 	}
 	item, err := ppt_english.GetPptEnglishByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -281,7 +281,7 @@ func (this *PptEnglishController) EditPpt() {
 	if pptInfo.AdminId != this.SysUser.AdminId {
 		_, err := ppt_english.GetPPtGrantConf(pptInfo.PptId, this.SysUser.AdminId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = `该PPT已取消共享,保存失败`
 				br.ErrMsg = `该PPT已取消共享,保存失败`
 				br.IsSendEmail = false
@@ -709,7 +709,7 @@ func (this *PptEnglishController) SaveLog() {
 
 	// 获取ppt
 	item, err := ppt_english.GetPptEnglishByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -1081,7 +1081,7 @@ func (this *PptEnglishController) TitleCheck() {
 		return
 	}
 	item, err := ppt_english.GetPptEnglishByTitleAndId(title, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return

+ 5 - 5
controllers/ppt_v2.go

@@ -136,7 +136,7 @@ func (this *PptV2Controller) AddPpt() {
 			return
 		}
 		item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据异常!"
 			br.ErrMsg = "获取数据异常,Err:" + err.Error()
 			return
@@ -260,7 +260,7 @@ func (this *PptV2Controller) EditPpt() {
 		return
 	}
 	item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -281,7 +281,7 @@ func (this *PptV2Controller) EditPpt() {
 	if pptInfo.AdminId != this.SysUser.AdminId {
 		_, err := models.GetPPtGrantConf(pptInfo.PptId, this.SysUser.AdminId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = `该PPT已取消共享,保存失败`
 				br.ErrMsg = `该PPT已取消共享,保存失败`
 				br.IsSendEmail = false
@@ -678,7 +678,7 @@ func (this *PptV2Controller) SaveLog() {
 
 	// 获取ppt
 	item, err := models.GetPptV2ByTitleAndId(req.FirstPage.Title, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -1258,7 +1258,7 @@ func (this *PptV2Controller) TitleCheck() {
 		return
 	}
 	item, err := models.GetPptV2ByTitleAndId(title, this.SysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return

+ 3 - 3
controllers/report.go

@@ -379,7 +379,7 @@ func (this *ReportController) ClassifyIdDetail() {
 		classifyIdSecond, _ = this.GetInt("ClassifyIdSecond")
 	}
 	item, err := models.GetReportDetailByClassifyId(classifyIdFirst, classifyIdSecond)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败!"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
@@ -852,7 +852,7 @@ func (this *ReportController) ThsSendTemplateMsg() {
 
 		report, err := models.GetReportById(v)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "报告已经被删除,请刷新页面"
 				br.ErrMsg = "报告已经被删除,请刷新页面,req:" + string(this.Ctx.Input.RequestBody)
 				return
@@ -1457,7 +1457,7 @@ func (this *ReportController) GetLastDayWeekReportChapter() {
 	typeId, _ := this.GetInt("TypeId")
 	reportType := this.GetString("ReportType")
 	item, err := models.GetLastPublishedReportChapter(typeId, reportType)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取上一篇晨周报失败, Err: " + err.Error()
 		return

+ 9 - 9
controllers/report_author.go

@@ -112,7 +112,7 @@ func (this *ReportAuthorController) AddAuthor() {
 		return
 	}
 	item, err := models.GetReportAuthorByAuthor(authorName, req.AuthorType)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -170,7 +170,7 @@ func (this *ReportAuthorController) EditAuthor() {
 	authorName := strings.TrimSuffix(req.Author, " ")
 	authorName = strings.TrimPrefix(authorName, " ")
 	otherItem, err := models.GetReportAuthorByAuthorAndId(authorName, req.AuthorType, req.Id)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -183,7 +183,7 @@ func (this *ReportAuthorController) EditAuthor() {
 	}
 
 	item, err := models.GetReportAuthorById(req.Id)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -218,7 +218,7 @@ func (this *ReportAuthorController) EditAuthor() {
 		} else {
 			count, err = models.ModifyEnglishReportAuthor(condition, pars, authorName)
 		}
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据异常!"
 			br.ErrMsg = "获取是否存在该作者的报告数据异常,Err:" + err.Error()
 			return
@@ -258,7 +258,7 @@ func (this *ReportAuthorController) EnableAuthor() {
 	}
 
 	item, err := models.GetReportAuthorById(req.Id)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -277,7 +277,7 @@ func (this *ReportAuthorController) EnableAuthor() {
 		condition = " AND author_type = ?"
 		pars = append(pars, item.AuthorType)
 		total, err := models.GetReportAuthorCount(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据异常!"
 			br.ErrMsg = "获取剩余作者数据异常,Err:" + err.Error()
 			return
@@ -326,7 +326,7 @@ func (this *ReportAuthorController) DeleteAuthor() {
 	}
 
 	item, err := models.GetReportAuthorById(req.Id)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常!"
 		br.ErrMsg = "获取数据异常,Err:" + err.Error()
 		return
@@ -345,7 +345,7 @@ func (this *ReportAuthorController) DeleteAuthor() {
 		condition = " AND author_type = ?"
 		pars = append(pars, item.AuthorType)
 		total, err := models.GetReportAuthorCount(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据异常!"
 			br.ErrMsg = "获取剩余作者数据异常,Err:" + err.Error()
 			return
@@ -370,7 +370,7 @@ func (this *ReportAuthorController) DeleteAuthor() {
 		} else {
 			count, err = models.GetEnglishReportListCount(condition, pars, "")
 		}
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取数据异常!"
 			br.ErrMsg = "获取是否存在该作者的报告数据异常,Err:" + err.Error()
 			return

+ 1 - 2
controllers/report_chapter.go

@@ -1004,7 +1004,7 @@ func (this *ReportController) GetSunCode() {
 	var sunCodeUrl string
 	//先查,查不到再去生成上传
 	item, err := models.GetYbPcSunCode(req.CodeScene, req.CodePage)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "查询太阳码失败!"
 		br.ErrMsg = "查询太阳码失败,Err:" + err.Error()
 		return
@@ -1714,4 +1714,3 @@ func checkOpPermission(sysUser *system.Admin, reportInfo *models.Report, reportC
 
 	return
 }
-

+ 1 - 1
controllers/report_chapter_type.go

@@ -642,7 +642,7 @@ func (this *ReportChapterTypeController) SetEnabled() {
 	ob := new(models.ReportChapterType)
 	item, err := models.GetReportChapterTypeById(req.ReportChapterTypeId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "章节不存在"
 			br.ErrMsg = "章节不存在, Err:" + err.Error()
 			return

+ 2 - 2
controllers/report_v2.go

@@ -649,7 +649,7 @@ func (this *ReportController) Detail() {
 	}
 	item, err := models.GetReportById(reportId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告已被删除"
 			return
 		}
@@ -1016,7 +1016,7 @@ func (this *ReportController) BaseDetail() {
 	}
 	reportInfo, err := models.GetReportById(reportId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "报告已被删除"
 			return
 		}

+ 21 - 23
controllers/sandbox/sandbox.go

@@ -77,7 +77,7 @@ type SandboxController struct {
 //		return
 //	}
 //
-//	if list == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+//	if list == nil || (err != nil && utils.IsErrNoRow(err)) {
 //		list = make([]*sandbox.SandboxListItem, 0)
 //	}
 //
@@ -185,14 +185,14 @@ func (this *SandboxController) FirstVersionList() {
 
 	//获取指标信息
 	total, list, err := sandbox.GetVersionList(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取沙盘列表失败"
 		br.ErrMsg = "获取沙盘列表失败,Err:" + err.Error()
 		return
 	}
 
-	if list == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || (err != nil && utils.IsErrNoRow(err)) {
 		list = make([]*sandbox.SandboxVersionListItem, 0)
 	}
 	for _, v := range list {
@@ -259,14 +259,14 @@ func (this *SandboxController) VersionList() {
 
 	//获取指标信息
 	total, list, err := sandbox.GetVersionList(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取沙盘列表失败"
 		br.ErrMsg = "获取沙盘列表失败,Err:" + err.Error()
 		return
 	}
 
-	if list == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || (err != nil && utils.IsErrNoRow(err)) {
 		list = make([]*sandbox.SandboxVersionListItem, 0)
 	}
 	for _, v := range list {
@@ -418,7 +418,7 @@ func (this *SandboxController) AddSandboxDraft() {
 	// 获取沙盘版本信息
 	sandboxVersion, err := sandbox.GetSandboxVersionBySandboxVersionCode(req.SandboxVersionCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "找不到该版本!"
 			br.ErrMsg = "找不到该版本"
 			return
@@ -798,14 +798,14 @@ func (this *SandboxController) ListByQuote() {
 
 	//获取指标信息
 	total, list, err := sandbox.GetList(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取沙盘列表失败"
 		br.ErrMsg = "获取沙盘列表失败,Err:" + err.Error()
 		return
 	}
 
-	if list == nil || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || (err != nil && utils.IsErrNoRow(err)) {
 		list = make([]*sandbox.Sandbox, 0)
 	}
 
@@ -865,14 +865,14 @@ func (this *SandboxController) SandboxClassifyItems() {
 	}
 
 	rootList, err := sandbox.GetSandboxClassifyAndInfoByParentId(sandboxClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := sandbox.GetSandboxClassifyAndInfoByParentId(sandboxClassifyId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1096,7 +1096,7 @@ func (this *SandboxController) DeleteSandboxClassifyCheck() {
 
 	if deleteStatus != 1 {
 		classifyCount, err := sandbox.GetSandboxInfoCountByClassifyId(req.SandboxClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有沙盘失败,Err:" + err.Error()
 			return
@@ -1157,7 +1157,7 @@ func (this *SandboxController) DeleteSandboxClassify() {
 	if req.SandboxClassifyId > 0 && req.SandboxId == 0 {
 		//判断是否含有指标
 		count, err := sandbox.GetSandboxInfoCountByClassifyId(req.SandboxId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -1181,7 +1181,7 @@ func (this *SandboxController) DeleteSandboxClassify() {
 	if req.SandboxId > 0 {
 		sandboxInfo, err := sandbox.GetSandboxById(req.SandboxId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "沙盘已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -1430,7 +1430,7 @@ func (this *SandboxController) ChartClassifyMove() {
 		} else {
 			// prevId为0,也就是沙盘移到最前端
 			firstClassify, err := sandbox.GetFirstSandboxByClassifyId(req.ClassifyId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 				return
@@ -1619,7 +1619,7 @@ func (this *SandboxController) ChartClassifyMove() {
 
 		} else {
 			firstClassify, err := sandbox.GetFirstSandboxClassifyByParentId(sandboxClassifyInfo.ParentId)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "移动失败"
 				br.ErrMsg = "获取获取当前父级分类下的排序第一条的分类信息失败,Err:" + err.Error()
 				return
@@ -1718,7 +1718,7 @@ func (this *SandboxController) ListV2() {
 
 	if sandboxClassifyId > 0 {
 		sandboxClassifyId, err := sandbox.GetSandboxClassify(sandboxClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -1740,7 +1740,7 @@ func (this *SandboxController) ListV2() {
 	//获取图表信息
 	condition += ` AND is_delete = 0 `
 	list, err := sandbox.GetSandboxListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取沙盘信息失败"
 		br.ErrMsg = "获取沙盘信息失败,Err:" + err.Error()
@@ -1757,7 +1757,7 @@ func (this *SandboxController) ListV2() {
 		list[i].ParentIds = ids
 	}
 	resp := new(sandbox.SandboxListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*sandbox.SandboxListItems, 0)
 		resp.Paging = page
 		resp.List = items
@@ -1768,7 +1768,7 @@ func (this *SandboxController) ListV2() {
 	}
 
 	dataCount, err := sandbox.GetSandboxListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -2341,14 +2341,14 @@ func (this *SandboxController) SandboxClassifyList() {
 	resp := new(sandbox.SandboxClassifyListResp)
 
 	rootList, err := sandbox.GetSandboxClassifyByParentId(0)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
 	}
 
 	classifyAll, err := sandbox.GetSandboxClassifyAll()
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -2408,7 +2408,6 @@ func (this *SandboxController) LinkEdbInfoCheck() {
 		}
 	}
 
-
 	chartList, err := data_manage.GetChartInfoByIdList(req.ChartInfoIdList)
 	if err != nil {
 		br.Msg = `获取失败`
@@ -2430,7 +2429,6 @@ func (this *SandboxController) LinkEdbInfoCheck() {
 		}
 	}
 
-
 	reportList, err := models.GetSimpleReportByIds(req.ReportIdList)
 	if err != nil {
 		br.Msg = `获取失败`

+ 1 - 1
controllers/semantic_analysis/sa_compare.go

@@ -701,7 +701,7 @@ func (this *SaCompareController) Search() {
 		existPars = append(existPars, utils.GetLikeKeyword(keyword))
 	}
 	total, list, err = saCompare.GetPageItemsByCondition(startSize, pageSize, existCond, existPars, []string{}, "")
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 		return

+ 10 - 10
controllers/sys_admin.go

@@ -402,7 +402,7 @@ func (this *SysAdminController) Add() {
 
 	roleItem, err := system.GetSysRoleById(req.RoleId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "所选角色不存在"
 			return
 		}
@@ -416,7 +416,7 @@ func (this *SysAdminController) Add() {
 	if req.DepartmentId > 0 {
 		departmentItem, err := system.GetSysDepartmentById(req.DepartmentId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "所选部门不存在"
 				return
 			}
@@ -432,7 +432,7 @@ func (this *SysAdminController) Add() {
 	if req.GroupId > 0 {
 		groupItem, err := system.GetSysGroupById(req.GroupId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "所选分组不存在"
 				return
 			}
@@ -448,7 +448,7 @@ func (this *SysAdminController) Add() {
 	if req.TeamId > 0 {
 		teamItem, err := system.GetSysGroupById(req.TeamId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "所选小组不存在"
 				return
 			}
@@ -634,7 +634,7 @@ func (this *SysAdminController) Edit() {
 	//根据用户id获取用户信息
 	adminInfo, err := system.GetSysAdminById(req.AdminId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "用户已被删除, 请刷新页面"
 			return
 		}
@@ -645,7 +645,7 @@ func (this *SysAdminController) Edit() {
 
 	// 根据用户登录用户名获取用户信息
 	item, err := system.GetSysAdminByName(req.AdminName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取系统用户数据失败,Err:" + err.Error() + ";AdminName:" + req.AdminName
 		return
@@ -704,7 +704,7 @@ func (this *SysAdminController) Edit() {
 
 	roleItem, err := system.GetSysRoleById(req.RoleId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "角色不存在,请重新选择"
 			br.ErrMsg = "角色不存在"
 			return
@@ -1021,7 +1021,7 @@ func (this *SysAdminController) SetConfig() {
 
 	item, err := system.GetConfigDetailByCode(this.SysUser.AdminId, req.ConfigCode)
 	if err != nil {
-		if err.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(err) {
 			br.Msg = "设置失败"
 			br.ErrMsg = "设置失败,Err:" + err.Error()
 			return
@@ -1104,7 +1104,7 @@ func (this *SysAdminController) Move() {
 	}
 
 	adminInfo, err := system.GetSysAdminById(req.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取系统用户数据失败,Err:" + err.Error() + ";AdminId:" + fmt.Sprint(req.AdminId)
 		return
@@ -1252,7 +1252,7 @@ func (this *SysAdminController) ResetPass() {
 
 	adminInfo, err := system.GetSysAdminById(req.AdminId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "用户已被删除, 请刷新页面"
 			return
 		}

+ 1 - 1
controllers/sys_department.go

@@ -100,7 +100,7 @@ func (this *SysDepartmentController) Edit() {
 		return
 	}
 	item, err := system.GetSysDepartmentByName(req.DepartmentName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/sys_group.go

@@ -108,7 +108,7 @@ func (this *SysGroupController) Edit() {
 		return
 	}
 	item, err := system.GetSysGroupByName(req.GroupName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/sys_menu.go

@@ -56,7 +56,7 @@ func (this *SysRoleController) SysMenuList() {
 	//共享客户组下的用户
 	shareSellerMap := make(map[int]bool, 0)
 	subAdmins, err := system.GetAdminByGroupId(groupId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取销售失败"
 		br.ErrMsg = "获取销售失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/sys_menu_button.go

@@ -46,7 +46,7 @@ func (this *SysRoleController) SysMenuButtons() {
 	roleId, _ := this.GetInt("RoleId")
 	checkList := make([]*int, 0)
 	cl, err := system.GetRoleButtonCheck(roleId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return

+ 2 - 2
controllers/sys_role.go

@@ -41,7 +41,7 @@ func (this *SysRoleController) Add() {
 		return
 	}
 	count, err := system.GetSysRoleCount(req.RoleName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -174,7 +174,7 @@ func (this *SysRoleController) Delete() {
 
 	role, e := system.GetSysRoleById(req.RoleId)
 	if e != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "角色不存在, 请刷新页面"
 			return
 		}

+ 2 - 2
controllers/sys_role_admin.go

@@ -58,7 +58,7 @@ func (this *SysRoleAdminController) List() {
 	// 查询留言管理员的角色ID:yb_comment_admin
 	roleInfo, err := system.GetSysRoleByRoleTypeCode(roleTypeCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该角色不存在!"
 			br.ErrMsg = "该角色不存在,Err:" + err.Error()
 			return
@@ -232,7 +232,7 @@ func (this *SysRoleAdminController) AddAdmin() {
 	// 查询留言管理员的角色ID
 	roleInfo, err := system.GetSysRoleByRoleTypeCode(req.RoleTypeCode)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "该角色不存在!"
 			br.ErrMsg = "该角色不存在,Err:" + err.Error()
 			return

+ 1 - 1
controllers/sys_team.go

@@ -104,7 +104,7 @@ func (this *SysTeamController) Edit() {
 		return
 	}
 	item, err := system.GetSysTeamByName(req.TeamName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return

+ 1 - 1
controllers/sys_user.go

@@ -46,7 +46,7 @@ func (this *SysUserController) Login() {
 	}
 	sysUser, err := system.CheckSysUser(req.Username, req.Password)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "登录失败,账号或密码错误"
 			br.ErrMsg = "登录失败,账号或密码错误,Err:" + err.Error()
 			br.IsSendEmail = false

+ 13 - 13
controllers/target.go

@@ -164,7 +164,7 @@ func (this *TargetController) DataAdd() {
 		return
 	}
 	item, err := models.GetDataInfo(req.TradeCode, req.CreateDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取信息失败!"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
@@ -262,7 +262,7 @@ func (this *TargetController) DataEdit() {
 
 	if req.OldCreateDate == "" {
 		item, err := models.GetDataInfo(req.TradeCode, req.CreateDate)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取信息失败!"
 			br.ErrMsg = "获取信息失败,Err:" + err.Error()
 			return
@@ -292,7 +292,7 @@ func (this *TargetController) DataEdit() {
 			}
 		} else {
 			item, err := models.GetDataInfo(req.TradeCode, req.CreateDate)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取信息失败!"
 				br.ErrMsg = "获取信息失败,Err:" + err.Error()
 				return
@@ -313,7 +313,7 @@ func (this *TargetController) DataEdit() {
 				}
 			}
 			oldItem, err := models.GetDataInfo(req.TradeCode, req.OldCreateDate)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取信息失败!"
 				br.ErrMsg = "获取信息失败,Err:" + err.Error()
 				return
@@ -605,7 +605,7 @@ func (this *TargetController) TargetAdd() {
 		return
 	}
 	item, err := models.GetEdbinfoBySecName(req.SecName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取信息失败!"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
@@ -668,7 +668,7 @@ func (this *TargetController) TargetEdit() {
 		return
 	}
 	item, err := models.GetEdbinfoBySecName(req.SecName)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取信息失败!"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
@@ -1144,7 +1144,7 @@ func (this *TargetController) ExportDataList() {
 			rowModifyCell.SetValue(v.Dt)
 			tradeCodeList = append(tradeCodeList, v.TradeCode)
 			items, err := models.GetEdbdataAllByTradeCode(v.TradeCode)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.ErrMsg = "GetEdbdataAllByTradeCode,Err:" + err.Error()
 				br.Msg = "获取数据失败"
 				return
@@ -1271,7 +1271,7 @@ func (this *TargetController) DataDelete() {
 		return
 	}
 	item, err := models.GetDataInfo(req.TradeCode, req.CreateDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取信息失败!"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
@@ -1322,7 +1322,7 @@ func (this *TargetController) DataCheck() {
 	}
 	resp := new(models.DataCheckResp)
 	item, err := models.GetDataInfo(tradeCode, createDate)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.Msg = "获取数据失败,Err:" + err.Error()
 		return
@@ -1365,7 +1365,7 @@ func (this *TargetController) TargetCheck() {
 	}
 	resp := new(models.DataCheckResp)
 	count, err := data_manage.GetEdbInfoCount(utils.DATA_SOURCE_MANUAL, tradeCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据失败"
 		br.Msg = "获取数据失败,Err:" + err.Error()
 		return
@@ -2855,7 +2855,7 @@ func (this *TargetController) ImportTarget() {
 						//return
 					}
 					item, err := models.GetEdbinfoBySecName(secName)
-					if err != nil && err.Error() != utils.ErrNoRow() {
+					if err != nil && !utils.IsErrNoRow(err) {
 						failItem := &models.EdbImportFail{
 							ClassifyName: classifyName,
 							Frequency:    frequency,
@@ -3406,7 +3406,7 @@ func (this *TargetController) ExcelDataAdd() {
 						tmpTarget, err := models.GetTargetBySecName(secName)
 						if err != nil {
 							//如果是找不到该指标,那么新增指标
-							if err.Error() == utils.ErrNoRow() {
+							if utils.IsErrNoRow(err) {
 								//if frequency == "" {
 								//	failItem := new(models.EdbdataImportFail)
 								//	failItem.SysUserId = strconv.Itoa(sysUser.AdminId)
@@ -3912,7 +3912,7 @@ func (this *TargetController) ExcelDataEdit() {
 //						tmpTarget, err := models.GetTargetBySecName(secName)
 //						if err != nil {
 //							//如果是找不到该指标,那么新增指标
-//							if err.Error() == utils.ErrNoRow() {
+//							if utils.IsErrNoRow(err) {
 //								if frequency == "" {
 //									failItem := new(models.EdbdataImportFail)
 //									failItem.SysUserId = strconv.Itoa(sysUser.AdminId)

+ 12 - 12
controllers/trade_analysis/warehouse.go

@@ -652,7 +652,7 @@ func (this *WarehouseController) Detail() {
 	chartInfo := new(data_manage.ChartInfoView)
 	chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图被删除,请刷新页面"
 			br.ErrMsg = "图被删除,请刷新页面,Err:" + err.Error()
 			return
@@ -784,7 +784,7 @@ func (this *WarehouseController) Detail() {
 			myChartPars = append(myChartPars, chartInfo.ChartInfoId)
 
 			myChartList, err := data_manage.GetMyChartByCondition(myChartCondition, myChartPars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取我的图表信息失败,GetMyChartByCondition,Err:" + err.Error()
 				return
@@ -900,7 +900,7 @@ func (this *WarehouseController) List() {
 
 	if chartClassifyId > 0 {
 		classifyIds, err := data_manage.GetChartClassify(chartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取图表信息失败"
 			br.ErrMsg = "获取信息失败,GetChartClassify,Err:" + err.Error()
 			return
@@ -943,7 +943,7 @@ func (this *WarehouseController) List() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -961,7 +961,7 @@ func (this *WarehouseController) List() {
 
 	//获取图表信息
 	list, err := data_manage.GetChartListByCondition(condition, pars, startSize, pageSize)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Success = true
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
@@ -969,7 +969,7 @@ func (this *WarehouseController) List() {
 	}
 
 	myChartList, err := data_manage.GetMyChartListByAdminId(sysUser.AdminId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取图表信息失败"
 		br.ErrMsg = "获取我的图表信息失败,Err:" + err.Error()
 		return
@@ -1013,7 +1013,7 @@ func (this *WarehouseController) List() {
 	}
 
 	resp := new(data_manage.ChartListResp)
-	if list == nil || len(list) <= 0 || (err != nil && err.Error() == utils.ErrNoRow()) {
+	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
 		items := make([]*data_manage.ChartInfoView, 0)
 		resp.Paging = page
 		resp.List = items
@@ -1024,7 +1024,7 @@ func (this *WarehouseController) List() {
 	}
 
 	dataCount, err := data_manage.GetChartListCountByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取指标信息失败"
 		br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
 		return
@@ -1218,7 +1218,7 @@ func (this *WarehouseController) Refresh() {
 		chartInfo, err = data_manage.GetChartInfoByUniqueCode(uniqueCode)
 	}
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,无需刷新"
 			br.ErrMsg = "获取指标信息失败,Err:" + err.Error()
 			return
@@ -1294,7 +1294,7 @@ func (this *WarehouseController) SearchByEs() {
 	{
 		obj := data_manage.EdbInfoNoPermissionAdmin{}
 		confList, err := obj.GetAllChartListByAdminId(this.SysUser.AdminId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取不可见指标配置数据失败,Err:" + err.Error()
 			return
@@ -1308,7 +1308,7 @@ func (this *WarehouseController) SearchByEs() {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
 		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败,Err:" + err.Error()
 			return
@@ -1406,7 +1406,7 @@ func (this *WarehouseController) ChartInfoSave() {
 
 	chartItem, err := data_manage.GetChartInfoById(req.ChartInfoId)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
+		if utils.IsErrNoRow(err) {
 			br.Msg = "图表已被删除,请刷新页面!"
 			br.ErrMsg = "图表已被删除,请刷新页面,ChartInfoId:" + strconv.Itoa(req.ChartInfoId)
 			return

+ 7 - 7
controllers/trade_analysis/warehouse_classify.go

@@ -75,7 +75,7 @@ func (this *WarehouseClassifyController) ChartClassifyList() {
 	nodeAll := make([]*data_manage.ChartClassifyItems, 0)
 	// 查询分类节点
 	rootList, err := data_manage.GetChartClassifyByParentId(parentId, utils.CHART_SOURCE_TRADE_ANALYSIS_PROCESS)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败,Err:" + err.Error()
 		return
@@ -323,7 +323,7 @@ func (this *WarehouseClassifyController) DeleteChartClassifyCheck() {
 
 	if deleteStatus != 1 && req.ChartInfoId == 0 {
 		classifyCount, err := data_manage.GetChartClassifyCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "分类下是否含有图表失败,Err:" + err.Error()
 			return
@@ -385,7 +385,7 @@ func (this *WarehouseClassifyController) DeleteChartClassify() {
 	if req.ChartClassifyId > 0 && req.ChartInfoId == 0 {
 		//判断是否含有指标
 		count, err := data_manage.GetChartInfoCountByClassifyId(req.ChartClassifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "判断名称是否已存在失败,Err:" + err.Error()
 			return
@@ -409,7 +409,7 @@ func (this *WarehouseClassifyController) DeleteChartClassify() {
 	if req.ChartInfoId > 0 {
 		chartInfo, err := data_manage.GetChartInfoById(req.ChartInfoId)
 		if err != nil {
-			if err.Error() == utils.ErrNoRow() {
+			if utils.IsErrNoRow(err) {
 				br.Msg = "图表已删除,请刷新页面"
 				br.ErrMsg = "指标不存在,Err:" + err.Error()
 				return
@@ -490,7 +490,7 @@ func (this *WarehouseClassifyController) DeleteChartClassify() {
 		pars = append(pars, req.ChartInfoId)
 
 		nextItem, err := data_manage.GetChartInfoByCondition(condition, pars)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			br.Msg = "删除失败"
 			br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 			return
@@ -510,14 +510,14 @@ func (this *WarehouseClassifyController) DeleteChartClassify() {
 			pars = append(pars, chartInfo.ChartClassifyId)
 
 			classifyItem, err := data_manage.GetChartClassifyByCondition(condition, pars)
-			if err != nil && err.Error() != utils.ErrNoRow() {
+			if err != nil && !utils.IsErrNoRow(err) {
 				br.Msg = "删除失败"
 				br.ErrMsg = "获取下一级图库分类信息失败,Err:" + err.Error()
 				return
 			}
 			if classifyItem != nil {
 				nextItem, err = data_manage.GetNextChartInfo(chartInfo.ChartClassifyId)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "删除失败"
 					br.ErrMsg = "获取下一级图库信息失败,Err:" + err.Error()
 					return

Some files were not shown because too many files changed in this diff