From adeec8aafe23ed8255941db26e2245d7da8f6405 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 08 一月 2025 15:30:41 +0800
Subject: [PATCH] 修改了家庭设备排序时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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..a292d25 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
@@ -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