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 ca9f682..af1e3bc 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))); }