From e126ec9be7a8f8d2c351f2843a9a184d1bcc8703 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期五, 30 五月 2025 16:48:52 +0800
Subject: [PATCH] 修改用户
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index eace39e..a75dc70 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -152,7 +152,7 @@
list = zfAncestorService.selectByCondition(zfAncestor);
// log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
}
/**
@@ -166,7 +166,7 @@
List<AncestorClan> list = zfAncestorService.selectByIds(ids);
// log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
- util.exportExcel(response, list, "淇濇磥鏀剁撼璁板綍鏁版嵁");
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
}
@@ -185,10 +185,14 @@
//淇敼sys_user琛�
SysUser us = new SysUser();
- us.setNickName(ancestorHelper.getName());
- // us.setStatus(String.valueOf(zfAncestor.getStatus()));
- us.setSex(String.valueOf(ancestorHelper.getSex()));
- us.setUserName(ancestorHelper.getName());
+ if (ancestorHelper.getName() != null) {
+ us.setNickName(ancestorHelper.getName());
+ us.setUserName(ancestorHelper.getName());
+ // us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ }
+ if(ancestorHelper.getSex() != null)
+ us.setSex(String.valueOf(ancestorHelper.getSex()));
+
// us.setClanId(ancestorHelper.getClanId());
us.setUserId(ancestorHelper.getSysId());
@@ -201,9 +205,12 @@
//淇敼z_info_user琛�
ZInfoUser infoUser = new ZInfoUser();
infoUser.setSysId(us.getUserId());
- infoUser.setNickName(us.getNickName());
- infoUser.setOldName(us.getUserName());
- infoUser.setSex(Integer.parseInt(us.getSex()));
+ if (ancestorHelper.getName() != null) {
+ infoUser.setNickName(us.getNickName());
+ infoUser.setOldName(us.getUserName());
+ }
+ if(ancestorHelper.getSex() != null)
+ infoUser.setSex(Integer.parseInt(us.getSex()));
ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(us.getUserId());
infoUser.setUserId(infoBysysId.getUserId());
@@ -212,7 +219,9 @@
//淇敼zf_ancestor琛�
ZfAncestor zfAncestor = new ZfAncestor();
// zfAncestor.setClanId(ancestorHelper.getClanId());
+ if (ancestorHelper.getName() != null)
zfAncestor.setName(ancestorHelper.getName());
+ if(ancestorHelper.getSex() != null)
zfAncestor.setSex(ancestorHelper.getSex());
zfAncestor.setSysId(ancestorHelper.getSysId());
--
Gitblit v1.9.1