From 2746921f12702d4075d857713ac67bbe3de05813 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 23 五月 2024 09:59:13 +0800
Subject: [PATCH] fix: 获取司机配送员信息接口修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
index 3d50971..6edb241 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -18,6 +18,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
import java.util.List;
/**
@@ -70,6 +73,7 @@
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鍙告満鍜岄厤閫佸憳鎸囩汗鏁版嵁")
public Result<List<Fingerprint>> getAll() {
QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
+ wrapper.select(" id,code,file_id,user_id ");
wrapper.isNotNull("user_id");
wrapper.isNotNull("file_id");
List<Fingerprint> list = iFingerprintService.list(wrapper);
@@ -144,9 +148,11 @@
wrapper.eq("code",code);
wrapper.isNotNull("user_id");
Fingerprint one = iFingerprintService.getOne(wrapper);
- User byUsername = userService.findByUsername(one.getUsername());
- if(byUsername==null){
+ User user = userService.findByUsername(one.getUsername());
+ if(user==null){
return ResultUtil.error("鐢ㄦ埛宸插垹闄�");
+ }else{
+ one.setPassword(Base64.getEncoder().encodeToString(user.getDescription().getBytes(StandardCharsets.UTF_8)));
}
return new ResultUtil<Object>().setData(one);
}
@@ -212,6 +218,7 @@
}
}
+
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {
--
Gitblit v1.9.1