修复用户管理新增bug

src/main/java/com/gz/controller/system/AdminController.java

@@ -7,10 +7,10 @@ import com.gz.dto.system.AdminDTO;
 import com.gz.rvo.system.AdminRVO;
 import com.gz.service.system.AdminService;
 import com.gz.vo.system.AdminVO;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,23 +25,33 @@ public class AdminController {
     @Resource
     private AdminService adminService;
 
-    @PostMapping("insert")
+    @PostMapping("addOrUpdate")
     @TraceLog(module = "管理员管理",business = "新增管理员")
-    public Integer insert(@RequestBody AdminDTO adminDTO){
-        return adminService.insert(adminDTO);
+    public Integer addOrUpdate(@RequestBody AdminDTO adminDTO){
+        if(StringUtils.isNotBlank(adminDTO.getId())){
+            return adminService.update(adminDTO);
+        }else{
+            return adminService.insert(adminDTO);
+        }
     }
 
+//    @PostMapping("insert")
+//    @TraceLog(module = "管理员管理",business = "新增管理员")
+//    public Integer insert(@RequestBody AdminDTO adminDTO){
+//        return adminService.insert(adminDTO);
+//    }
+
     @DeleteMapping("delete")
     @TraceLog(module = "管理员管理",business = "删除管理员")
     public Integer delete( Integer id){
         return adminService.delete(id);
     }
 
-    @PostMapping("update")
-    @TraceLog(module = "管理员管理",business = "修改管理员")
-    public Integer update(@RequestBody AdminDTO adminDTO){
-        return adminService.update(adminDTO);
-    }
+//    @PostMapping("update")
+//    @TraceLog(module = "管理员管理",business = "修改管理员")
+//    public Integer update(@RequestBody AdminDTO adminDTO){
+//        return adminService.update(adminDTO);
+//    }
 
     @GetMapping("select")
     @TraceLog(module = "管理员管理",business = "查询管理员列表")

src/main/java/com/gz/core/UUIDBaseDTO.java

@@ -1,15 +1,11 @@
 package com.gz.core;
 
-import cn.hutool.core.date.DateUtil;
-import com.gz.utils.JwtUtils;
 import com.gz.utils.UUIdGenId;
 import lombok.Data;
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.annotation.LogicDelete;
 
-import javax.annotation.sql.DataSourceDefinitions;
 import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 /**

src/main/resources/static/page/admin/edit.html

@@ -104,12 +104,12 @@
         let deptId = ''
         // url参数
         const urlParam = layui.url()
-
+        console.log('urlParam.id',urlParam.id);
         /**方-------------------------------法-------------------------------定-------------------------------义*/
 
             //保存方法
         let save = function (data) {
-                http.post(urlParam.id == '' ? 'system/admin/insert' : 'system/admin/update', data, true, function (res) {
+                http.post('system/admin/addOrUpdate', data, true, function (res) {
                     if (res.code == 200) {
                         let index = layer.alert('保存成功!', {
                             title: urlParam.id == '' ? '添加' : '修改' + '信息'