From 9cf6f32fc0d7a30f2c6673c0315f08a7379aa179 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Mon, 22 Jul 2024 17:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E3=80=81?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E9=80=89=E6=8B=A9=E6=90=9C=E7=B4=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/leger/controller/EquipmentLedgerController.java | 1 + .../energy/modules/system/service/impl/UserServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java index 20b19a3..b03ce6d 100644 --- a/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java +++ b/src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java @@ -266,6 +266,7 @@ public class EquipmentLedgerController extends DafController { if (StringUtils.isNotEmpty(coding)) { queryWrapper.lambda().like(EquipmentLedger::getKksEncoding, coding); } + queryWrapper.lambda().eq(EquipmentLedger::getCheckStatus, 2); queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED); queryWrapper.lambda().orderByDesc(EquipmentLedger::getKksEncoding); queryWrapper.lambda().last(" LIMIT 50"); diff --git a/src/main/java/org/energy/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/UserServiceImpl.java index 28c17bc..71098ce 100644 --- a/src/main/java/org/energy/modules/system/service/impl/UserServiceImpl.java +++ b/src/main/java/org/energy/modules/system/service/impl/UserServiceImpl.java @@ -138,7 +138,8 @@ public class UserServiceImpl extends BaseServiceImpl implement @Override public boolean resetPassword(String userIds) { User user = new User(); - user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD)); +// user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD)); + user.setPassword(DigestUtil.encrypt("8Nn!yjWKpR")); user.setUpdateTime(DateUtil.now()); return this.update(user, Wrappers.update().lambda().in(User::getId, Func.toLongList(userIds))); }