From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
index 9e9700e..57efec3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -4,6 +4,7 @@
import java.util.Calendar;
import java.util.List;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.BaseOnlyvalue;
import com.ruoyi.project.service.IBaseOnlyvalueService;
import com.ruoyi.web.controller.common.OnlyValueCommon;
@@ -49,9 +50,10 @@
/**
* 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceExternalperson serviceExternalperson) {
+ logger.info("璇㈠鍥村崟浣嶄汉鍛樺垪琛ㄧ殑鍏ュ弬涓� 锛歿}", serviceExternalperson);
startPage();
List<ServiceExternalperson> list = serviceExternalpersonService.queryList(serviceExternalperson);
return getDataTable(list);
@@ -60,7 +62,7 @@
/**
* 瀵煎嚭澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:export')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceExternalperson serviceExternalperson) {
@@ -72,7 +74,7 @@
/**
* 鑾峰彇澶栧洿鍗曚綅浜哄憳璇︾粏淇℃伅
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceExternalpersonService.getById(id));
@@ -81,21 +83,24 @@
/**
* 鏂板澶栧洿鍗曚綅浜哄憳
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:add')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson) {
- String zj = onlyValueCommon.addOnlyValue("zj");
- String formattedNumber = String.format("%05d", zj);
- serviceExternalperson.setUserno(formattedNumber);
- return toAjax(serviceExternalpersonService.save(serviceExternalperson));
+ if (StringUtils.isEmpty(serviceExternalperson.getUserno())) {
+ String zj = onlyValueCommon.addOnlyValue("zj");
+ String formattedNumber = String.format("%05d", zj);
+ serviceExternalperson.setUserno(formattedNumber);
+ }
+ boolean save1 = serviceExternalpersonService.save(serviceExternalperson);
+ return AjaxResult.success(serviceExternalperson);
}
/**
* 淇敼澶栧洿鍗曚綅浜哄憳
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:edit')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.UPDATE)
@PostMapping("/editZJInfo")
@RepeatSubmit
@@ -106,7 +111,7 @@
/**
* 鍒犻櫎澶栧洿鍗曚綅浜哄憳
*/
- //@PreAuthorize("@ss.hasPermi('project:externalperson:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:externalperson:remove')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
--
Gitblit v1.9.3