jihs преди 3 години
родител
ревизия
ad11de55eb

+ 1 - 1
jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/mapper/ActBusinessMapper.java

@@ -35,7 +35,7 @@ public interface ActBusinessMapper extends BaseMapper<ActBusiness> {
             "      WHERE TYPE_ = #{type} AND TASK_ID_ = #{taskId}")
     List<String> selectIRunIdentity(@Param("taskId")String taskId,@Param("type") String type);
 
-    @Select("select * from ${tableName} where ${pid} = #{tableId}")
+    @Select("select * from ${tableName} where ${pid} = #{tableId} ORDER BY sort")
     List<Map<String, Object>> getChildList(@Param("tableId") String tableId, @Param("tableName") String tableName, @Param("pid") String pid);
     @Delete("${sql}")
     void deletetBusiData(@Param("sql") String format);

+ 1 - 1
jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActBusinessServiceImpl.java

@@ -293,6 +293,6 @@ public class ActBusinessServiceImpl extends ServiceImpl<ActBusinessMapper, ActBu
     }
 
     public List<Map<String,Object>> getChildList(String tableId, String tableName, String pid) {
-        return this.baseMapper.getChildList(tableId, tableName, pid);
+            return this.baseMapper.getChildList(tableId, tableName, pid);
     }
 }

+ 2 - 3
jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -109,9 +109,8 @@ public class ActBusinessController {
                 for(int i = 0; i < tableNamesChidArr.length; i++){
                     list = actBusinessService.getChildList(tableId, tableNamesChidArr[i], tableName+"_id");
                     int j = i+1;
-                    applyForm.put("childList"+ j, list);
+                    applyForm.put("childList"+ j + "&" +tableName, list);
                 }
-
             }
             return Result.ok(applyForm);
         } else {
@@ -124,7 +123,7 @@ public class ActBusinessController {
                 for(int i = 0; i < tableNamesChidArr.length; i++){
                     list = actBusinessService.getChildList(tableId, tableNamesChidArr[i], tableName+"_id");
                     int j = i+1;
-                    applyForm.put("childList"+ j, list);
+                    applyForm.put("childList"+ j + "&" +tableName, list);
                 }
 
             }