From c800257cb6c8b45e7edc20e2e9018cd90b230806 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 09 七月 2025 19:50:00 +0800
Subject: [PATCH] art: 技术状态鉴定-基础代码生成
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 6e13dbd..a3a94d7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -167,6 +167,7 @@
item.setOrgCodeTxt(useDepNames.get(item.getId()));
item.setProductionName(useProNames.get(item.getId()));
item.setRepairDepartName(useRepDepNames.get(item.getId()));
+ item.setEamFactoryIds( String.join(",",iBaseFactoryUserService.queryEamCenterIdsByUserId(item.getId())));
});
}
result.setSuccess(true);
@@ -184,6 +185,7 @@
String selectedDeparts = jsonObject.getString("selecteddeparts");
String selectedProductions = jsonObject.getString("selectedProduction");
String selectedRepairDeparts = jsonObject.getString("selectedRepairDeparts");
+ String factoryIds=jsonObject.getString("selectedBaseFactory");
try {
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
user.setCreateTime(new Date());//璁剧疆鍒涘缓鏃堕棿
@@ -199,6 +201,9 @@
user.setOrgCode(null);
// 淇濆瓨鐢ㄦ埛璧颁竴涓猻ervice 淇濊瘉浜嬪姟
sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedProductions, selectedRepairDeparts);
+ if (oConvertUtils.isNotEmpty(factoryIds)) {
+ iBaseFactoryUserService.addUserFactory(user.getId(), factoryIds);
+ }
baseCommonService.addLog("娣诲姞鐢ㄦ埛锛寀sername锛� " + user.getUsername(), CommonConstant.LOG_TYPE_2, 2);
result.success("娣诲姞鎴愬姛锛�");
} catch (Exception e) {
@@ -227,6 +232,7 @@
String departs = jsonObject.getString("selecteddeparts");
String productions = jsonObject.getString("selectedProduction");
String repairDeparts = jsonObject.getString("selectedRepairDeparts");
+ String factoryIds=jsonObject.getString("selectedBaseFactory");
if (oConvertUtils.isEmpty(departs)) {
//vue3.0鍓嶇鍙紶閫掍簡departIds
departs = user.getDepartIds();
@@ -236,6 +242,9 @@
}
if (oConvertUtils.isNotEmpty(repairDeparts)) {
repairDeparts = user.getRepairDepartIds();
+ }
+ if (oConvertUtils.isNotEmpty(factoryIds)) {
+ iBaseFactoryUserService.addUserFactory(user.getId(), factoryIds);
}
//鐢ㄦ埛琛ㄥ瓧娈祇rg_code涓嶈兘鍦ㄨ繖閲岃缃粬鐨勫��
user.setOrgCode(null);
@@ -458,8 +467,8 @@
}
}
- @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁")
- @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜岀淮淇儴闂ㄥ叧鑱旂殑鏁版嵁")
+ @AutoLog(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜孍AM涓績鍏宠仈鐨勬暟鎹�")
+ @ApiOperation(value = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜孍AM涓績鍏宠仈鐨勬暟鎹�", notes = "鐢ㄦ埛琛�-鏌ヨ鎸囧畾鐢ㄦ埛鍜孍AM涓績鍏宠仈鐨勬暟鎹�")
@GetMapping(value = "/userBaseFactoryList")
public Result<List<EamBaseFactoryIdModel>> userBaseFactoryList(@RequestParam(name = "userId", required = true) String userId) {
Result<List<EamBaseFactoryIdModel>> result = new Result<>();
--
Gitblit v1.9.3