From f0b05984d000a21ade0f365729dfb34506a45a23 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 11 八月 2025 09:15:31 +0800
Subject: [PATCH] art: SAP 报工接口调试修改
---
src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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 ee03b35..d0ff657 100644
--- a/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -12,7 +12,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import liquibase.pro.packaged.I;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -31,8 +30,6 @@
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.base.service.IUserFactoryService;
import org.jeecg.modules.base.service.IUserGroupService;
-import org.jeecg.modules.mdc.model.ProductionIdModel;
-import org.jeecg.modules.mdc.service.IMdcUserProductionService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.base.model.FactoryIdModel;
@@ -108,8 +105,8 @@
@Resource
private IUserFactoryService userFactoryService;
- @Resource
- private IMdcUserProductionService userProductionService;
+// @Resource
+// private IMdcUserProductionService userProductionService;
@Resource
private IUserGroupService userGroupService;
@@ -253,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());//璁剧疆鍒涘缓鏃堕棿
@@ -295,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();
@@ -476,17 +473,17 @@
}
- @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁")
- @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜屼骇绾垮叧鑱旂殑鏁版嵁")
- @GetMapping(value = "/userProductionList")
- public Result<List<ProductionIdModel>> getUserProductionsList(@RequestParam(name = "userId", required = true) String userId) {
- Result<List<ProductionIdModel>> result = new Result<>();
+ @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<ProductionIdModel> proIdModelList = this.userProductionService.queryProductionIdsOfUser(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