From f769e7c35bd1f8deb4f587ee9b019d633cecf8d6 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期五, 30 五月 2025 17:07:12 +0800
Subject: [PATCH] 修改用户
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index e9e091f..f28d240 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -67,7 +67,7 @@
private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
- lqw.orderByDesc(ZfEquipment::getCreateTime);
+ lqw.orderByDesc(ZfEquipment::getHappenTime);
lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName());
lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer());
lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent());
@@ -231,7 +231,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
--
Gitblit v1.9.1