From afb71a0770acc36a6e062aecf2dfc1c92d2d80a7 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 12 八月 2025 11:59:09 +0800 Subject: [PATCH] art: SAP 物料请求预留号接口调试 --- src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index a438754..d0ff657 100644 --- a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -105,6 +105,9 @@ @Resource private IUserFactoryService userFactoryService; +// @Resource +// private IMdcUserProductionService userProductionService; + @Resource private IUserGroupService userGroupService; @@ -247,7 +250,7 @@ Result<SysUser> result = new Result<SysUser>(); String selectedRoles = jsonObject.getString("selectedroles"); String selectedDeparts = jsonObject.getString("selecteddeparts"); - String selectedProductions = jsonObject.getString("selectedProduction"); + String selectedProductions = jsonObject.getString("selectedFactorys"); try { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); user.setCreateTime(new Date());//璁剧疆鍒涘缓鏃堕棿 @@ -289,7 +292,7 @@ user.setPassword(sysUser.getPassword()); String roles = jsonObject.getString("selectedroles"); String departs = jsonObject.getString("selecteddeparts"); - String productions = jsonObject.getString("selectedProduction"); + String productions = jsonObject.getString("selectedFactorys"); if (oConvertUtils.isEmpty(departs)) { //vue3.0鍓嶇鍙紶閫掍簡departIds departs = user.getDepartIds(); @@ -470,17 +473,17 @@ } - @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁") - @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁") - @GetMapping(value = "/userProductionList") - public Result<List<FactoryIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) { + @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屽伐鍘傚缓妯″叧鑱旂殑鏁版嵁") + @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屽伐鍘傚缓妯″叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屽伐鍘傚缓妯″叧鑱旂殑鏁版嵁") + @GetMapping(value = "/userFactorysList") + public Result<List<FactoryIdModel>> getUserFactorysList(@RequestParam(name = "userId", required = true) String userId) { Result<List<FactoryIdModel>> result = new Result<>(); try { - List<FactoryIdModel> proIdModelList = this.userFactoryService.queryFactoryIdsOfUser(userId); - if (proIdModelList != null && !proIdModelList.isEmpty()) { + List<FactoryIdModel> facIdModelList = this.userFactoryService.queryFactoryIdsOfUser(userId); + if (facIdModelList != null && !facIdModelList.isEmpty()) { result.setSuccess(true); result.setMessage("鏌ユ壘鎴愬姛"); - result.setResult(proIdModelList); + result.setResult(facIdModelList); } else { result.setSuccess(false); result.setMessage("鏌ユ壘澶辫触"); -- Gitblit v1.9.3