From d74ad3fdaf67038cecfcadc5cb1800985224a2a6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 22 八月 2025 15:30:57 +0800
Subject: [PATCH] 用户管理导出导入功能改造
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 14 ++++++++++++++
lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java | 1 -
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java | 26 ++++++++------------------
3 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index b88f825..d87394e 100644
--- a/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -1,6 +1,5 @@
package org.jeecg.common.system.api;
-
import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.CommonAPI;
import org.jeecg.common.api.dto.DataLogDTO;
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 6be0483..3bfd0a2 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
@@ -565,6 +565,9 @@
sysUserExcel.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
sysUserExcel.setPassword(passwordEncode);
+ sysUserExcel.setDelFlag(CommonConstant.DEL_FLAG_0);
+ sysUserExcel.setPasswordFlag(CommonConstant.DEL_FLAG_1);
+ sysUserExcel.setPasswordTime(new Date());
try {
sysUserService.save(sysUserExcel);
successLines++;
@@ -599,6 +602,17 @@
}
sysUserDepartService.saveBatch(userDepartList);
}
+ // 鎵归噺灏嗕骇绾垮拰鐢ㄦ埛淇℃伅寤虹珛鍏宠仈鍏崇郴
+ String productionIds = sysUserExcel.getProductionIds();
+ if (StringUtils.isNotBlank(productionIds)) {
+ String userId = sysUserExcel.getId();
+ String[] productionIdArray = productionIds.split(",");
+ List<MdcUserProduction> userProductionList = new ArrayList<>(productionIdArray.length);
+ for (String productionId : productionIdArray) {
+ userProductionList.add(new MdcUserProduction(userId, productionId));
+ }
+ userProductionService.saveBatch(userProductionList);
+ }
}
} catch (Exception e) {
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 945b3ae..1ff2a2d 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -64,13 +64,11 @@
/**
* 澶村儚
*/
- @Excel(name = "澶村儚", width = 15,type = 2)
private String avatar;
/**
* 鐢熸棩
*/
- @Excel(name = "鐢熸棩", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@@ -78,20 +76,17 @@
/**
* 鎬у埆锛�1锛氱敺 2锛氬コ锛�
*/
- @Excel(name = "鎬у埆", width = 15,dicCode="sex")
@Dict(dicCode = "sex")
private Integer sex;
/**
* 鐢靛瓙閭欢
*/
- @Excel(name = "鐢靛瓙閭欢", width = 15)
private String email;
/**
* 鐢佃瘽
*/
- @Excel(name = "鐢佃瘽", width = 15)
private String phone;
/**
@@ -106,6 +101,12 @@
private transient String productionName;
/**
+ * 宸ュ彿锛屽敮涓�閿�
+ */
+ @Excel(name = "宸ュ彿", width = 15)
+ private String workNo;
+
+ /**
* 鐘舵��(1锛氭甯� 2锛氬喕缁� 锛�
*/
@Excel(name = "鐘舵��", width = 15,dicCode="user_status")
@@ -115,27 +116,18 @@
/**
* 鍒犻櫎鐘舵�侊紙0锛屾甯革紝1宸插垹闄わ級
*/
- @Excel(name = "鍒犻櫎鐘舵��", width = 15,dicCode="del_flag")
@TableLogic
private Integer delFlag;
/**
- * 宸ュ彿锛屽敮涓�閿�
- */
- @Excel(name = "宸ュ彿", width = 15)
- private String workNo;
-
- /**
* 鑱屽姟锛屽叧鑱旇亴鍔¤〃
*/
- @Excel(name = "鑱屽姟", width = 15)
@Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
private String post;
/**
* 搴ф満鍙�
*/
- @Excel(name = "搴ф満鍙�", width = 15)
private String telephone;
/**
@@ -165,26 +157,24 @@
/**
* 韬唤锛�0 鏅�氭垚鍛� 1 涓婄骇锛�
*/
- @Excel(name="锛�1鏅�氭垚鍛� 2涓婄骇锛�",width = 15)
private Integer userIdentity;
/**
* 鐢ㄦ埛绫诲瀷锛�1 鏅�氭垚鍛� 2 宸ユ 3 杞﹂棿 4 鍏徃锛�
*/
- @Excel(name="锛�1鏅�氭垚鍛� 2宸ユ 3杞﹂棿 4鍏徃锛�",width = 15)
private Integer userType;
/**
* 璐熻矗閮ㄩ棬
*/
- @Excel(name="璐熻矗閮ㄩ棬",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+// @Excel(name="璐熻矗閮ㄩ棬",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private String departIds;
/**
* 璐熻矗浜х嚎
*/
- @Excel(name="璐熻矗浜х嚎",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
+ @Excel(name="璐熻矗浜х嚎",width = 45,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
@Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
private String productionIds;
--
Gitblit v1.9.3