From 9e9bc96ae861e4d416a37ee412905f9f787083f0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 01 七月 2025 16:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
index 6ea1d2b..2f1250a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
@@ -68,9 +68,9 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
- String BaseFactoryId = req.getParameter("BaseFactoryId");
+ String baseFactoryId = req.getParameter("factoryId");
String username=req.getParameter("username");
- IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, BaseFactoryId,username);
+ IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, baseFactoryId,username);
result.setSuccess(true);
result.setResult(pageList);
return result;
@@ -127,9 +127,9 @@
@ApiOperation(value="璁惧杞﹂棿绠＄悊涓庣敤鎴�-閫氳繃id鍒犻櫎", notes="璁惧杞﹂棿绠＄悊涓庣敤鎴�-閫氳繃id鍒犻櫎")
//@RequiresPermissions("org.jeecg.modules.mdc:sys_work_shop_depart_user:delete")
@DeleteMapping(value = "/delete")
- public Result<String> delete(String id, String BaseFactoryId) {
+ public Result<String> delete(String id, String factoryId) {
QueryWrapper<BaseFactoryUser> queryWrapper = new QueryWrapper<BaseFactoryUser>();
- queryWrapper.eq("work_shop_depart_id", BaseFactoryId)
+ queryWrapper.eq("factory_id", factoryId)
.eq("user_id", id);
BaseFactoryUserService.remove(queryWrapper);
return Result.OK("鍒犻櫎鎴愬姛!");
@@ -145,9 +145,9 @@
@ApiOperation(value="璁惧杞﹂棿绠＄悊涓庣敤鎴�-鎵归噺鍒犻櫎", notes="璁惧杞﹂棿绠＄悊涓庣敤鎴�-鎵归噺鍒犻櫎")
//@RequiresPermissions("org.jeecg.modules.mdc:sys_work_shop_depart_user:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(String ids,String BaseFactoryId) {
+ public Result<String> deleteBatch(String ids,String factoryId) {
QueryWrapper<BaseFactoryUser> queryWrapper = new QueryWrapper<BaseFactoryUser>();
- queryWrapper.eq("work_shop_depart_id", BaseFactoryId)
+ queryWrapper.eq("factory_id", factoryId)
.in("user_id", Arrays.asList(ids.split(",")));
BaseFactoryUserService.remove(queryWrapper);
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
--
Gitblit v1.9.3