From 9ed4cb53a2c643b879f993537f5a2793fba56ba1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 31 三月 2025 07:57:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/DocTypeController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index d135838..ec0c0c0 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.service.DocTypeService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.service.DocTypeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -73,7 +72,7 @@
@ManagerAuth
public R update(DocType docType){
if (Cools.isEmpty(docType) || null==docType.getDocId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
docType.setUpdateBy(getUserId());
docType.setUpdateTime(new Date());
@@ -106,12 +105,12 @@
public R query(String condition) {
EntityWrapper<DocType> wrapper = new EntityWrapper<>();
wrapper.like("doc_name", condition);
- Page<DocType> page = docTypeService.selectPage(new Page<>(0, 10), wrapper);
+ Page<DocType> page = docTypeService.selectPage(new Page<>(0, 50), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (DocType docType : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", docType.getDocId());
- map.put("value", docType.getDocId());
+ map.put("value", docType.getDocName());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1