Преглед на файлове

自定义流程-BUG修改

wangliang преди 3 години
родител
ревизия
249de0bba3

+ 1 - 1
distributed-print-business/src/main/resources/mapper/TFFlowLogMapper.xml

@@ -32,7 +32,7 @@
             so.`type` as orgType,
              (
                  select
-                     group_concat(su.real_name, '(', so.name, ')')
+                     group_concat(su.real_name, '(', so.name, ')' order by field(tffl.pend_approve_id,replace(tffl.pend_approve_id, ', ', ',')))
                  from
                      sys_user su
                          join sys_org so on

+ 1 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/TFCustomFlowController.java

@@ -112,6 +112,7 @@ public class TFCustomFlowController {
                 if (!tfCustomFlow.getEnable()) {
                     throw ExceptionResultEnum.ERROR.exception("自定义流程数据已删除");
                 }
+                tfCustomFlow.setModelType(customFlowSaveDto.getModelType());
                 tfCustomFlow.setObjectData(JacksonUtil.parseJson(customFlowSaveDto.getCustomFlowLists()));
                 tfCustomFlow.updateInfo(sysUser.getId());
             }