Skip to content

Commit 7e7d857

Browse files
JavaLionLiJavaLionLi
committed
Merge remote-tracking branch 'origin/dev' into 5.X
2 parents d22b2a1 + 2e50e30 commit 7e7d857

File tree

6 files changed

+46
-3
lines changed

6 files changed

+46
-3
lines changed

‎ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private LambdaQueryWrapper<SysDictData> buildQueryWrapper(SysDictDataBo bo) {
5858
lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort());
5959
lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel());
6060
lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType());
61-
lqw.orderByAsc(SysDictData::getDictSort);
61+
lqw.orderByAsc(SysDictData::getDictSort, SysDictData::getDictCode);
6262
return lqw;
6363
}
6464

‎ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.dromara.warm.flow.core.listener.GlobalListener;
1616
import org.dromara.warm.flow.core.listener.ListenerVariable;
1717
import org.dromara.warm.flow.core.service.InsService;
18+
import org.dromara.warm.flow.orm.entity.FlowInstance;
1819
import org.dromara.warm.flow.orm.entity.FlowTask;
1920
import org.dromara.workflow.common.ConditionalOnEnable;
2021
import org.dromara.workflow.common.constant.FlowConstant;
@@ -151,13 +152,15 @@ public void finish(ListenerVariable listenerVariable) {
151152
flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
152153
}
153154
}
155+
FlowInstance ins = new FlowInstance();
154156
Map<String, Object> variableMap = instance.getVariableMap();
155157
variableMap.remove(FlowConstant.FLOW_COPY_LIST);
156158
variableMap.remove(FlowConstant.MESSAGE_TYPE);
157159
variableMap.remove(FlowConstant.MESSAGE_NOTICE);
158160
variableMap.remove(FlowConstant.SUBMIT);
159-
instance.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
160-
insService.updateById(instance);
161+
ins.setId(instance.getId());
162+
ins.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
163+
insService.updateById(ins);
161164
}
162165
}
163166
}

‎script/sql/oracle/oracle_ry_vue_5.X.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,10 @@ insert into sys_role_menu values ('3', '107');
623623
insert into sys_role_menu values ('3', '108');
624624
insert into sys_role_menu values ('3', '118');
625625
insert into sys_role_menu values ('3', '123');
626+
insert into sys_role_menu values ('3', '130');
627+
insert into sys_role_menu values ('3', '131');
628+
insert into sys_role_menu values ('3', '132');
629+
insert into sys_role_menu values ('3', '133');
626630
insert into sys_role_menu values ('3', '500');
627631
insert into sys_role_menu values ('3', '501');
628632
insert into sys_role_menu values ('3', '1001');
@@ -696,8 +700,11 @@ insert into sys_role_menu values ('3', '1620');
696700
insert into sys_role_menu values ('3', '1621');
697701
insert into sys_role_menu values ('3', '1622');
698702
insert into sys_role_menu values ('3', '1623');
703+
insert into sys_role_menu values ('3', '11616');
699704
insert into sys_role_menu values ('3', '11618');
700705
insert into sys_role_menu values ('3', '11619');
706+
insert into sys_role_menu values ('3', '11622');
707+
insert into sys_role_menu values ('3', '11623');
701708
insert into sys_role_menu values ('3', '11629');
702709
insert into sys_role_menu values ('3', '11632');
703710
insert into sys_role_menu values ('3', '11633');
@@ -707,6 +714,7 @@ insert into sys_role_menu values ('3', '11640');
707714
insert into sys_role_menu values ('3', '11641');
708715
insert into sys_role_menu values ('3', '11642');
709716
insert into sys_role_menu values ('3', '11643');
717+
insert into sys_role_menu values ('3', '11701');
710718
insert into sys_role_menu values ('4', '5');
711719
insert into sys_role_menu values ('4', '1500');
712720
insert into sys_role_menu values ('4', '1501');

‎script/sql/postgres/postgres_ry_vue_5.X.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,10 @@ insert into sys_role_menu values ('3', '107');
624624
insert into sys_role_menu values ('3', '108');
625625
insert into sys_role_menu values ('3', '118');
626626
insert into sys_role_menu values ('3', '123');
627+
insert into sys_role_menu values ('3', '130');
628+
insert into sys_role_menu values ('3', '131');
629+
insert into sys_role_menu values ('3', '132');
630+
insert into sys_role_menu values ('3', '133');
627631
insert into sys_role_menu values ('3', '500');
628632
insert into sys_role_menu values ('3', '501');
629633
insert into sys_role_menu values ('3', '1001');
@@ -697,8 +701,11 @@ insert into sys_role_menu values ('3', '1620');
697701
insert into sys_role_menu values ('3', '1621');
698702
insert into sys_role_menu values ('3', '1622');
699703
insert into sys_role_menu values ('3', '1623');
704+
insert into sys_role_menu values ('3', '11616');
700705
insert into sys_role_menu values ('3', '11618');
701706
insert into sys_role_menu values ('3', '11619');
707+
insert into sys_role_menu values ('3', '11622');
708+
insert into sys_role_menu values ('3', '11623');
702709
insert into sys_role_menu values ('3', '11629');
703710
insert into sys_role_menu values ('3', '11632');
704711
insert into sys_role_menu values ('3', '11633');
@@ -708,6 +715,7 @@ insert into sys_role_menu values ('3', '11640');
708715
insert into sys_role_menu values ('3', '11641');
709716
insert into sys_role_menu values ('3', '11642');
710717
insert into sys_role_menu values ('3', '11643');
718+
insert into sys_role_menu values ('3', '11701');
711719
insert into sys_role_menu values ('4', '5');
712720
insert into sys_role_menu values ('4', '1500');
713721
insert into sys_role_menu values ('4', '1501');

‎script/sql/ry_vue_5.X.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,10 @@ insert into sys_role_menu values ('3', '107');
448448
insert into sys_role_menu values ('3', '108');
449449
insert into sys_role_menu values ('3', '118');
450450
insert into sys_role_menu values ('3', '123');
451+
insert into sys_role_menu values ('3', '130');
452+
insert into sys_role_menu values ('3', '131');
453+
insert into sys_role_menu values ('3', '132');
454+
insert into sys_role_menu values ('3', '133');
451455
insert into sys_role_menu values ('3', '500');
452456
insert into sys_role_menu values ('3', '501');
453457
insert into sys_role_menu values ('3', '1001');
@@ -521,8 +525,11 @@ insert into sys_role_menu values ('3', '1620');
521525
insert into sys_role_menu values ('3', '1621');
522526
insert into sys_role_menu values ('3', '1622');
523527
insert into sys_role_menu values ('3', '1623');
528+
insert into sys_role_menu values ('3', '11616');
524529
insert into sys_role_menu values ('3', '11618');
525530
insert into sys_role_menu values ('3', '11619');
531+
insert into sys_role_menu values ('3', '11622');
532+
insert into sys_role_menu values ('3', '11623');
526533
insert into sys_role_menu values ('3', '11629');
527534
insert into sys_role_menu values ('3', '11632');
528535
insert into sys_role_menu values ('3', '11633');
@@ -532,6 +539,7 @@ insert into sys_role_menu values ('3', '11640');
532539
insert into sys_role_menu values ('3', '11641');
533540
insert into sys_role_menu values ('3', '11642');
534541
insert into sys_role_menu values ('3', '11643');
542+
insert into sys_role_menu values ('3', '11701');
535543
insert into sys_role_menu values ('4', '5');
536544
insert into sys_role_menu values ('4', '1500');
537545
insert into sys_role_menu values ('4', '1501');

‎script/sql/sqlserver/sqlserver_ry_vue_5.X.sql

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2494,6 +2494,14 @@ INSERT sys_role_menu VALUES (3, 118);
24942494
GO
24952495
INSERT sys_role_menu VALUES (3, 123);
24962496
GO
2497+
INSERT sys_role_menu VALUES (3, 130);
2498+
GO
2499+
INSERT sys_role_menu VALUES (3, 131);
2500+
GO
2501+
INSERT sys_role_menu VALUES (3, 132);
2502+
GO
2503+
INSERT sys_role_menu VALUES (3, 133);
2504+
GO
24972505
INSERT sys_role_menu VALUES (3, 500);
24982506
GO
24992507
INSERT sys_role_menu VALUES (3, 501);
@@ -2640,10 +2648,16 @@ INSERT sys_role_menu VALUES (3, 1622);
26402648
GO
26412649
INSERT sys_role_menu VALUES (3, 1623);
26422650
GO
2651+
INSERT sys_role_menu VALUES (3, 11616);
2652+
GO
26432653
INSERT sys_role_menu VALUES (3, 11618);
26442654
GO
26452655
INSERT sys_role_menu VALUES (3, 11619);
26462656
GO
2657+
INSERT sys_role_menu VALUES (3, 11622);
2658+
GO
2659+
INSERT sys_role_menu VALUES (3, 11623);
2660+
GO
26472661
INSERT sys_role_menu VALUES (3, 11629);
26482662
GO
26492663
INSERT sys_role_menu VALUES (3, 11632);
@@ -2662,6 +2676,8 @@ INSERT sys_role_menu VALUES (3, 11642);
26622676
GO
26632677
INSERT sys_role_menu VALUES (3, 11643);
26642678
GO
2679+
INSERT sys_role_menu VALUES (3, 11701);
2680+
GO
26652681
INSERT sys_role_menu VALUES (4, 5);
26662682
GO
26672683
INSERT sys_role_menu VALUES (4, 1500);

0 commit comments

Comments
 (0)