Merge branch 'master' of http://47.97.51.208/root/zrch-risk-39

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java

@@ -7,6 +7,7 @@ import org.jeecg.modules.flowable.domain.dto.FlowViewerDto;
 import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
 
 import java.io.InputStream;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -180,6 +181,7 @@ public interface IFlowTaskService {
 
 
     public Result<List<String>> todoListAll();
+    public void saveMyTaskFlow(String thistaskId,Task nextTask,String userType,String approvalId,String messageTaskName);
+    public void saveMyTaskFlowHis(Task task,String userType,String approvalId,Date cdate,String loginUserid,String taskType,String OptionType);
 
-
-}
+    }

zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -471,7 +471,11 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
 
                 }
 
+                String userType="user";
+                String approvalId=sysUser.getId();
+                flowTaskService.saveMyTaskFlowHis(task,userType,approvalId,cdate,sysUser.getId(),ProcessConstants.TASK_TYPE_START,OptionType);
 
+/**
                 MyTaskFlowHis taskFlowHis=new MyTaskFlowHis();
                 taskFlowHis.setTaskId(task.getId());
                 taskFlowHis.setProcDefId(task.getProcessDefinitionId());
@@ -488,8 +492,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
                     taskFlowHis.setFormTableName(flowForm.getFormTableName());
                 }
 
-                String userType="user";
-                String approvalId=sysUser.getId();
+
 
                 if(userType.equals("user")) {
                     taskFlowHis.setUid(approvalId);
@@ -509,6 +512,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
                 taskFlowHis.setFlowName(flowname);
 
                 myTaskFlowHisService.save(taskFlowHis);
+                */
 
 
 

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/page/controller/PageTitleconfigController.java

@@ -114,8 +114,8 @@ public class PageTitleconfigController extends JeecgController<PageTitleconfig,
                         wrapper.or().in("roleid", Arrays.asList(finalRoleids.split(",")));
                     }
                 })
-                .orderByDesc("priority")
-                .orderByDesc("st_time");
+                .orderByDesc("st_time")
+                .orderByDesc("priority");
         queryWrapper.last("limit 5");
         List<MyTask> list = myTaskService.list(queryWrapper);
         return Result.OK(list);