1

GxPress/Api/GxPress.Api/AppControllers/AppFlowController.cs

@@ -126,7 +126,8 @@ namespace GxPress.Api.AppControllers
         public async Task<ListResult> PostList(FlowListRequest request)
         {
             var userId = _loginContext.AccountId;
-
+            request.Page = request.Page <= 0 ? 1 : request.Page;
+            request.PerPage = request.PerPage <= 0 ? 15 : request.PerPage;
             if (request.Type == nameof(FlowListTypeConst.MyChecking))
             {
                 return await _flowService.ListMyCheckingAsync(userId, request, nameof(FlowListTypeConst.MyChecking));

GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowTodoRepository.cs

@@ -409,16 +409,15 @@ namespace GxPress.Repository.Implement.WorkFlow
 
         public async Task<int> GetCountAsync(int userId, string type, bool isDone, FlowListRequest request)
         {
-
             string sql = $@"SELECT 
-                               count(1)
+                              count(1)
                             FROM
                                 tede_flow_todo a
                                     INNER JOIN
                                 tede_process b ON a.ProcessId = b.id
                                     INNER JOIN
                                 tede_flow c ON c.Id = a.FlowId
-                                INNER JOIN
+                                 INNER JOIN
                                  tede_user d on d.Id=a.UserId
                                  INNER JOIN
                                  tede_user e on e.Id=c.UserId
@@ -426,8 +425,8 @@ namespace GxPress.Repository.Implement.WorkFlow
                                 a.UserId = {userId}
                                     AND a.Type = '{type}'";
             if (isDone)
-                sql += $@" AND a.IsDone = 1";
-            else sql += $@" AND a.IsDone = 0 AND a.IsOperate = 1";
+                sql += $@"AND a.IsDone = 1";
+            else sql += $@"AND a.IsDone = 0 AND a.IsOperate = 1";
             if (!string.IsNullOrWhiteSpace(request.Keyword))
             {
                 sql += $@" AND (b.Name LIKE '%{request.Keyword}%'
@@ -442,7 +441,8 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     FROM
                                         tede_user
                                     WHERE
-                                        Name LIKE '%{request.Keyword}%') or a.FlowId In(SELECT 
+                                        Name LIKE '%{request.Keyword}%') 
+                                        or a.FlowId In(SELECT 
                                                                                     FlowId
                                                                                 FROM
                                                                                     tede_flow_todo
@@ -453,7 +453,7 @@ namespace GxPress.Repository.Implement.WorkFlow
                                                                                             tede_user
                                                                                         WHERE
                                                                                             Name LIKE '%{request.Keyword}%'))
-                                                                or a.FlowId In(SELECT 
+                                                or a.FlowId In(SELECT 
                                                                     FlowId
                                                                 FROM
                                                                     tede_flow_message