修复daoceng模板生成代码的bug

dao/wm/implments/ArticlePickingRate.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *ArticlePickingRateDAOImplement) SelectAndPaging(paging *grmi.Paging,
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/ArticleReplenish.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *ArticleReplenishDAOImplement) SelectAndPaging(paging *grmi.Paging, p
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/AssertArtLst.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *AssertArtLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/GoodsIssueDetail.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *GoodsIssueDetailDAOImplement) SelectAndPaging(paging *grmi.Paging, p
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/GoodsIssueHead.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *GoodsIssueHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, pre
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/GoodsIssueLst.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *GoodsIssueLstDAOImplement) SelectAndPaging(paging *grmi.Paging, pred
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/GoodsReceiptDetail.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *GoodsReceiptDetailDAOImplement) SelectAndPaging(paging *grmi.Paging,
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/GoodsReceiptHead.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *GoodsReceiptHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, p
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/GoodsReceiptLst.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *GoodsReceiptLstDAOImplement) SelectAndPaging(paging *grmi.Paging, pr
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/InventoryBook.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *InventoryBookDAOImplement) SelectAndPaging(paging *grmi.Paging, pred
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/InventoryCheckDetail.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *InventoryCheckDetailDAOImplement) SelectAndPaging(paging *grmi.Pagin
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/InventoryCheckHead.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *InventoryCheckHeadDAOImplement) SelectAndPaging(paging *grmi.Paging,
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/InventoryCheckLst.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *InventoryCheckLstDAOImplement) SelectAndPaging(paging *grmi.Paging,
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/ReplenishOrder.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *ReplenishOrderDAOImplement) SelectAndPaging(paging *grmi.Paging, pre
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/StockTransferDetail.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *StockTransferDetailDAOImplement) SelectAndPaging(paging *grmi.Paging
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/StockTransferHead.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *StockTransferHeadDAOImplement) SelectAndPaging(paging *grmi.Paging,
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/StorageArea.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *StorageAreaDAOImplement) SelectAndPaging(paging *grmi.Paging, predic
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/StorageBin.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *StorageBinDAOImplement) SelectAndPaging(paging *grmi.Paging, predica
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/StorageRack.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *StorageRackDAOImplement) SelectAndPaging(paging *grmi.Paging, predic
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/Warehouse.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *WarehouseDAOImplement) SelectAndPaging(paging *grmi.Paging, predicat
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)

dao/wm/implments/WorkArea.dao.impl.go

@@ -234,10 +234,15 @@ func (impl *WorkAreaDAOImplement) SelectAndPaging(paging *grmi.Paging, predicate
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)
@@ -307,11 +312,11 @@ func (impl *WorkAreaDAOImplement) UpdateWhere(predicates []grmi.Predicate, entit
 func (impl *WorkAreaDAOImplement) DeleteWorkAreaLst(selectType string, relId1 string, relId2 string) error {
 	var err error
 	if selectType == model.WORK_AREA_TYPE_WARE_HOUSE {
-		sql := fmt.Sprintf(`select %s from %s where %s = %s and %s = %s`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1)
+		sql := fmt.Sprintf(`select %s from %s where %s = '%s' and %s = '%s'`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1)
 		where := fmt.Sprintf(`%s in (%s)`, meta.WorkAreaUserLst_WorkAreaId.ColumnName, sql)
 		_, err = impl.session.Table(meta.WorkAreaUserLst.TableName).Where(where).Delete(impl.meta.Indicator)
 	} else {
-		sql := fmt.Sprintf(`select %s from %s where %s = %s and %s = %s and %s = %s`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1, meta.WorkArea_WACtrlPara3.ColumnName, relId2)
+		sql := fmt.Sprintf(`select %s from %s where %s = '%s' and %s = '%s' and %s = '%s'`, meta.WorkArea_WorkAreaId.ColumnName,meta.WorkArea.TableName, meta.WorkArea_WorkAreaType.ColumnName, selectType,meta.WorkArea_RelevanceId.ColumnName, relId1, meta.WorkArea_WACtrlPara3.ColumnName, relId2)
 		where := fmt.Sprintf(`%s in (%s)`, meta.WorkAreaUserLst_WorkAreaId.ColumnName, sql)
 		_, err = impl.session.Table(meta.WorkAreaUserLst.TableName).Where(where).Delete(impl.meta.Indicator)
 	}

dao/wm/implments/WorkAreaUserLst.dao.impl.go

@@ -233,10 +233,15 @@ func (impl *WorkAreaUserLstDAOImplement) SelectAndPaging(paging *grmi.Paging, pr
 		return grmi.EmptyPagingResult, err
 	}
 
-	orderBy := " order by "
+	var orderBy string
 	if orderByFields != nil {
-		for _, field := range orderByFields {
-			orderBy += ", " + field.ColumnName
+		orderBy = " order by "
+		for index, field := range orderByFields {
+			if index == 0 {
+				orderBy += field.ColumnName
+			} else {
+				orderBy += ", " + field.ColumnName
+			}
 		}
 	}
 	parameters = append(parameters, paging.Offset(), paging.Size)