From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/MatController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 0a2cf10..2d12e18 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -120,6 +120,7 @@
, param.get("matnr")
, param.get("maktx")
, param.get("specs")
+ , param.get("mat_type")
)
);
@@ -222,8 +223,10 @@
@RequestMapping(value = "/mat/covert/{id}/auth")
@ManagerAuth
- public R covert(@PathVariable("id") String id) {
- Mat mat = matService.selectByMatnr(String.valueOf(id));
+ public R covert(@PathVariable("id") String id) throws UnsupportedEncodingException{
+ byte[] decode = Base64.getDecoder().decode(id);
+ String id2 = new String(decode, "utf-8");
+ Mat mat = matService.selectByMatnr(id2);
if (mat == null) {
return R.ok();
}
--
Gitblit v1.9.1