update 优化 PermissionService 无实现类也可以启动服务

Merge pull request !691 from 疯狂的狮子Li/dev

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

@@ -58,7 +58,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort());
         lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel());
         lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType());
-        lqw.orderByAsc(SysDictData::getDictSort, SysDictData::getDictCode);
+        lqw.orderByAsc(SysDictData::getDictSort);
         return lqw;
     }
 

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

@@ -15,7 +15,6 @@ import org.dromara.warm.flow.core.entity.Task;
 import org.dromara.warm.flow.core.listener.GlobalListener;
 import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.dromara.warm.flow.core.service.InsService;
-import org.dromara.warm.flow.orm.entity.FlowInstance;
 import org.dromara.warm.flow.orm.entity.FlowTask;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.common.constant.FlowConstant;
@@ -152,15 +151,13 @@ public class WorkflowGlobalListener implements GlobalListener {
                         flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
                     }
                 }
-                FlowInstance ins = new FlowInstance();
                 Map<String, Object> variableMap = instance.getVariableMap();
                 variableMap.remove(FlowConstant.FLOW_COPY_LIST);
                 variableMap.remove(FlowConstant.MESSAGE_TYPE);
                 variableMap.remove(FlowConstant.MESSAGE_NOTICE);
                 variableMap.remove(FlowConstant.SUBMIT);
-                ins.setId(instance.getId());
+                instance.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
-                ins.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
+                insService.updateById(instance);
-                insService.updateById(ins);
             }
         }
     }

script/sql/oracle/oracle_ry_vue_5.X.sql

@@ -623,10 +623,6 @@ insert into sys_role_menu values ('3', '107');
 insert into sys_role_menu values ('3', '108');
 insert into sys_role_menu values ('3', '118');
 insert into sys_role_menu values ('3', '123');
-insert into sys_role_menu values ('3', '130');
-insert into sys_role_menu values ('3', '131');
-insert into sys_role_menu values ('3', '132');
-insert into sys_role_menu values ('3', '133');
 insert into sys_role_menu values ('3', '500');
 insert into sys_role_menu values ('3', '501');
 insert into sys_role_menu values ('3', '1001');
@@ -700,11 +696,8 @@ insert into sys_role_menu values ('3', '1620');
 insert into sys_role_menu values ('3', '1621');
 insert into sys_role_menu values ('3', '1622');
 insert into sys_role_menu values ('3', '1623');
-insert into sys_role_menu values ('3', '11616');
 insert into sys_role_menu values ('3', '11618');
 insert into sys_role_menu values ('3', '11619');
-insert into sys_role_menu values ('3', '11622');
-insert into sys_role_menu values ('3', '11623');
 insert into sys_role_menu values ('3', '11629');
 insert into sys_role_menu values ('3', '11632');
 insert into sys_role_menu values ('3', '11633');
@@ -714,7 +707,6 @@ insert into sys_role_menu values ('3', '11640');
 insert into sys_role_menu values ('3', '11641');
 insert into sys_role_menu values ('3', '11642');
 insert into sys_role_menu values ('3', '11643');
-insert into sys_role_menu values ('3', '11701');
 insert into sys_role_menu values ('4', '5');
 insert into sys_role_menu values ('4', '1500');
 insert into sys_role_menu values ('4', '1501');

script/sql/postgres/postgres_ry_vue_5.X.sql

@@ -624,10 +624,6 @@ insert into sys_role_menu values ('3', '107');
 insert into sys_role_menu values ('3', '108');
 insert into sys_role_menu values ('3', '118');
 insert into sys_role_menu values ('3', '123');
-insert into sys_role_menu values ('3', '130');
-insert into sys_role_menu values ('3', '131');
-insert into sys_role_menu values ('3', '132');
-insert into sys_role_menu values ('3', '133');
 insert into sys_role_menu values ('3', '500');
 insert into sys_role_menu values ('3', '501');
 insert into sys_role_menu values ('3', '1001');
@@ -701,11 +697,8 @@ insert into sys_role_menu values ('3', '1620');
 insert into sys_role_menu values ('3', '1621');
 insert into sys_role_menu values ('3', '1622');
 insert into sys_role_menu values ('3', '1623');
-insert into sys_role_menu values ('3', '11616');
 insert into sys_role_menu values ('3', '11618');
 insert into sys_role_menu values ('3', '11619');
-insert into sys_role_menu values ('3', '11622');
-insert into sys_role_menu values ('3', '11623');
 insert into sys_role_menu values ('3', '11629');
 insert into sys_role_menu values ('3', '11632');
 insert into sys_role_menu values ('3', '11633');
@@ -715,7 +708,6 @@ insert into sys_role_menu values ('3', '11640');
 insert into sys_role_menu values ('3', '11641');
 insert into sys_role_menu values ('3', '11642');
 insert into sys_role_menu values ('3', '11643');
-insert into sys_role_menu values ('3', '11701');
 insert into sys_role_menu values ('4', '5');
 insert into sys_role_menu values ('4', '1500');
 insert into sys_role_menu values ('4', '1501');

script/sql/ry_vue_5.X.sql

@@ -448,10 +448,6 @@ insert into sys_role_menu values ('3', '107');
 insert into sys_role_menu values ('3', '108');
 insert into sys_role_menu values ('3', '118');
 insert into sys_role_menu values ('3', '123');
-insert into sys_role_menu values ('3', '130');
-insert into sys_role_menu values ('3', '131');
-insert into sys_role_menu values ('3', '132');
-insert into sys_role_menu values ('3', '133');
 insert into sys_role_menu values ('3', '500');
 insert into sys_role_menu values ('3', '501');
 insert into sys_role_menu values ('3', '1001');
@@ -525,11 +521,8 @@ insert into sys_role_menu values ('3', '1620');
 insert into sys_role_menu values ('3', '1621');
 insert into sys_role_menu values ('3', '1622');
 insert into sys_role_menu values ('3', '1623');
-insert into sys_role_menu values ('3', '11616');
 insert into sys_role_menu values ('3', '11618');
 insert into sys_role_menu values ('3', '11619');
-insert into sys_role_menu values ('3', '11622');
-insert into sys_role_menu values ('3', '11623');
 insert into sys_role_menu values ('3', '11629');
 insert into sys_role_menu values ('3', '11632');
 insert into sys_role_menu values ('3', '11633');
@@ -539,7 +532,6 @@ insert into sys_role_menu values ('3', '11640');
 insert into sys_role_menu values ('3', '11641');
 insert into sys_role_menu values ('3', '11642');
 insert into sys_role_menu values ('3', '11643');
-insert into sys_role_menu values ('3', '11701');
 insert into sys_role_menu values ('4', '5');
 insert into sys_role_menu values ('4', '1500');
 insert into sys_role_menu values ('4', '1501');

script/sql/sqlserver/sqlserver_ry_vue_5.X.sql

@@ -2494,14 +2494,6 @@ INSERT sys_role_menu VALUES (3, 118);
 GO
 INSERT sys_role_menu VALUES (3, 123);
 GO
-INSERT sys_role_menu VALUES (3, 130);
-GO
-INSERT sys_role_menu VALUES (3, 131);
-GO
-INSERT sys_role_menu VALUES (3, 132);
-GO
-INSERT sys_role_menu VALUES (3, 133);
-GO
 INSERT sys_role_menu VALUES (3, 500);
 GO
 INSERT sys_role_menu VALUES (3, 501);
@@ -2648,16 +2640,10 @@ INSERT sys_role_menu VALUES (3, 1622);
 GO
 INSERT sys_role_menu VALUES (3, 1623);
 GO
-INSERT sys_role_menu VALUES (3, 11616);
-GO
 INSERT sys_role_menu VALUES (3, 11618);
 GO
 INSERT sys_role_menu VALUES (3, 11619);
 GO
-INSERT sys_role_menu VALUES (3, 11622);
-GO
-INSERT sys_role_menu VALUES (3, 11623);
-GO
 INSERT sys_role_menu VALUES (3, 11629);
 GO
 INSERT sys_role_menu VALUES (3, 11632);
@@ -2676,8 +2662,6 @@ INSERT sys_role_menu VALUES (3, 11642);
 GO
 INSERT sys_role_menu VALUES (3, 11643);
 GO
-INSERT sys_role_menu VALUES (3, 11701);
-GO
 INSERT sys_role_menu VALUES (4, 5);
 GO
 INSERT sys_role_menu VALUES (4, 1500);