From 3cf3656f3d69a6021226c794e5d9e69d091f48c3 Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期二, 04 七月 2023 11:21:28 +0800
Subject: [PATCH] 修改扭矩配置管理3
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
index 151f8ce..7a1ad30 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -5,9 +5,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
import org.jeecg.modules.mdc.service.impl.MdcTorqueConfigServiceImpl;
@@ -154,13 +156,18 @@
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
@ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ",notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
- @GetMapping("/queryWrapper")
- public Result<?> queryWrapper(MdcTorqueConfig mdcTorqueConfig,
+ @GetMapping("/pageList")
+ public Result pageList(MdcTorqueConfig mdcTorqueConfig,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- Page<MdcTorqueConfig> page=new Page<>(pageNo,pageSize);
- IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.queryPageList(page,req);
+ if (mdcTorqueConfig==null){
+ return Result.error("璇蜂紶閫掓湁鏁堝弬鏁�");
+ }
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId= user.getId();
+ Page page=new Page(pageNo,pageSize);
+ IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.pageList(userId,page,req,mdcTorqueConfig);
return Result.ok(mdcTorqueConfigIPage);
}
}
--
Gitblit v1.9.3