Merge branch 'feature_mps_2' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps_2

services/base/implments/Script.service.impl.go

@@ -542,17 +542,19 @@ func (impl *ScriptServiceImplement) ReadXlsx(user *global.User, path string, scr
 			//查询数据
 			var countLi []int
 			err := session.SQL(selectSql).Find(&countLi)
-			//没有数据就插入,有就更新
 			if len(countLi) == 0 {
-				_, err := session.Exec(insertSql)
+				return grmi.NewBusinessError("执行操作原有数据失败,错误为:countLi=0" + " sql:" + selectSql)
+			}
+			if countLi[0] > 0 {
+				//更新
+				_, err = session.Exec(updateSql)
 				if err != nil {
-					glog.InfoExtln("一位表导入","err:",err)
 					continue
 				}
 			} else {
-				//更新
-				_, err = session.Exec(updateSql)
+				_, err := session.Exec(insertSql)
 				if err != nil {
+					glog.InfoExtln("一位表导入","err:",err)
 					continue
 				}
 			}