扭矩管理查询数据有误

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/TorqueManageService.java

@@ -156,10 +156,14 @@ public class TorqueManageService implements ITorqueManageService {
 
     @Override
     public ListPager<MesProcessTorqueManageTaskDetail> queryTorqueManageTaskDetailReportByPager(MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail, Pager pager) {
-        DdlPackBean packBean = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail);
-
-        pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(packBean));
-        List<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWhere(packBean);
+        if (mesTorqueManageTaskDetail == null) {
+            pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.listCount());
+            return new ListPager(mesTorqueManageTaskDetailRDao.listPager(pager), pager);
+        } else {
+            DdlPackBean hqlPack = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail);
+            hqlPack.setOrderByStr(mesTorqueManageTaskDetail.orderBy());
+            pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(hqlPack));
+            List<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWherePage(hqlPack, pager);
 
             if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) {
 
@@ -184,6 +188,7 @@ public class TorqueManageService implements ITorqueManageService {
             }
             return new ListPager(torqueManageTaskDetailList, pager);
         }
+    }
 
     @Override
     public void doConfirmTorqueManageList(List<MesProcessTorqueManageTaskDetail> mesTorqueManageTaskDetailList, String userName) {