From fb6a6482b156527afc4f78ac900c14e4bd63327d Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 27 三月 2025 08:31:37 +0800
Subject: [PATCH] fix:菜单修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 234ca81..0fcbe92 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -7,6 +7,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.PageResult;
+import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -39,9 +40,17 @@
@PreAuthorize("hasAuthority('manager:matnr:list')")
@PostMapping("/matnr/page")
public R page(@RequestBody Map<String, Object> map) {
+// if (!Objects.isNull(map.get("groupId"))) {
+// return R.ok(matnrService.getPages(map));
+// } else {
+// BaseParam baseParam = buildParam(map, BaseParam.class);
+// PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
+// return R.ok().add(matnrService.getMatnrPage(pageParam, map));
+// }
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add(matnrService.getMatnrPage(pageParam));
+ return R.ok().add(matnrService.getMatnrPage(pageParam, map));
+
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -85,7 +94,7 @@
@OperationLog("Update 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/update")
@Transactional(rollbackFor = Exception.class)
- public R update(@RequestBody Map<String, Object> params) {
+ public R update(@RequestBody Map<String, Object> params) throws Exception {
Matnr matnr = JSONObject.parseObject(JSONObject.toJSONString(params), Matnr.class);
if (Objects.isNull(matnr.getCode())) {
throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
@@ -94,15 +103,22 @@
throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
matnr.setUpdateBy(getLoginUserId());
- if (!matnrService.updateById(matnr)) {
- return R.error("Update Fail");
- }
+
if (!FieldsUtils.getFieldsSta().isEmpty()) {
Matnr matnr1 = matnrService.getById(matnr.getId());
- params.put("fieldsIndex", matnr1.getFieldsIndex());
+ if (!Objects.isNull(matnr1.getFieldsIndex())) {
+ params.put("fieldsIndex", matnr1.getFieldsIndex());
+ } else {
+ String uuid16 = CommonUtil.randomUUID16();
+ params.put("index", uuid16);
+ matnr.setFieldsIndex(uuid16);
+ }
FieldsUtils.updateFieldsValue(params);
}
+ if (!matnrService.updateById(matnr)) {
+ return R.error("Update Fail");
+ }
return R.ok("Update Success").add(matnr);
}
--
Gitblit v1.9.1