From 2b8e522ec7c38570463a08e04bc1cc264a038e5b Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期一, 17 三月 2025 11:26:39 +0800
Subject: [PATCH] 整体BUG修改
---
src/main/java/com/product/contract/service/ProjectBusinessService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ProjectBusinessService.java b/src/main/java/com/product/contract/service/ProjectBusinessService.java
index 148fc7e..4c4754e 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -63,11 +63,13 @@
public JSONObject findTranslate(FieldSetEntity fse) {
FieldSetEntity fsData = baseDao.getFieldSetBySQL("SELECT project_type,date FROM product_project_business_translate where project_type=?", new String[]{fse.getString("project_type")}, false);
JSONObject rejson=BaseUtil.fieldSetEntityToJson(fsData);
- DataTableEntity projectType = baseDao.listTable(CmnConst.PRODUCT_PROJECT_BUSINESS_TRANSLATE, "project_type=? ORDER BY project_task", new String[]{fse.getString("project_type")});
+ DataTableEntity projectType = baseDao.listTable(CmnConst.PRODUCT_PROJECT_BUSINESS_TRANSLATE, "project_type=? ORDER BY project_task,id", new String[]{fse.getString("project_type")});
JSONObject json = new JSONObject();
for (int i = 0; i < projectType.getRows(); i++) {
FieldSetEntity fs = projectType.getFieldSetEntity(i);
- fs.remove("uuid");
+ if (!StringUtils.isEmpty(fse.getString("type")) &&fse.getString("type").equals("view")){
+ fs.remove("uuid");
+ }
if (json.getJSONArray(fs.getString("project_task"))==null){
JSONArray objects = new JSONArray();
objects.add(BaseUtil.fieldSetEntityToJson(fs));
--
Gitblit v1.9.2