From 70e2af5f68f37c7d0e08d696caea68f314eaf1d3 Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Sat, 15 Aug 2020 10:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E8=87=AA=E5=A2=9E=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/toesbieya/jxc/message/controller/ManageController.java | 2 +- .../toesbieya/jxc/system/controller/CustomerController.java | 1 + .../cn/toesbieya/jxc/system/controller/RoleController.java | 4 ++-- .../toesbieya/jxc/system/controller/SupplierController.java | 1 + .../cn/toesbieya/jxc/controller/msg/ManageController.java | 1 + .../cn/toesbieya/jxc/controller/sys/CategoryController.java | 1 + .../cn/toesbieya/jxc/controller/sys/CustomerController.java | 1 + .../cn/toesbieya/jxc/controller/sys/DepartmentController.java | 3 +++ .../java/cn/toesbieya/jxc/controller/sys/RoleController.java | 1 + .../cn/toesbieya/jxc/controller/sys/SupplierController.java | 1 + 10 files changed, 13 insertions(+), 3 deletions(-) diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java index e13773c..5bd435c 100644 --- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java +++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java @@ -29,7 +29,6 @@ public class ManageController { String errMsg = validateAdd(msg); if (errMsg != null) return R.fail(errMsg); - msg.setId(null); SysUser user = SessionUtil.get(); setAddInfo(user, msg); @@ -85,6 +84,7 @@ public class ManageController { } private void setAddInfo(SysUser user, Msg msg) { + msg.setId(null); msg.setCid(user.getId()); msg.setCname(user.getName()); msg.setCtime(System.currentTimeMillis()); diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/CustomerController.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/CustomerController.java index fa9ddb8..5d048da 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/CustomerController.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/CustomerController.java @@ -32,6 +32,7 @@ public class CustomerController { customer.setId(null); customer.setCtime(System.currentTimeMillis()); + return service.add(customer); } diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java index b109488..1a9e602 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java @@ -1,8 +1,8 @@ package cn.toesbieya.jxc.system.controller; import cn.toesbieya.jxc.common.model.entity.SysRole; -import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.R; +import cn.toesbieya.jxc.common.model.vo.UserVo; import cn.toesbieya.jxc.system.model.vo.RoleSearch; import cn.toesbieya.jxc.system.service.RoleService; import cn.toesbieya.jxc.web.common.util.SessionUtil; @@ -33,7 +33,7 @@ public class RoleController { return R.fail("添加失败，参数错误"); } - SysUser user = SessionUtil.get(); + UserVo user = SessionUtil.get(); role.setId(null); role.setCid(user.getId()); diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SupplierController.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SupplierController.java index 41c19a8..8b3218a 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SupplierController.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SupplierController.java @@ -32,6 +32,7 @@ public class SupplierController { supplier.setId(null); supplier.setCtime(System.currentTimeMillis()); + return service.add(supplier); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java index 9c5c498..43a3a70 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java @@ -83,6 +83,7 @@ public class ManageController { } private void setAddInfo(UserVo user, Msg msg) { + msg.setId(null); msg.setCid(user.getId()); msg.setCname(user.getName()); msg.setCtime(System.currentTimeMillis()); diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CategoryController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CategoryController.java index 7ee4d1b..71944b8 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CategoryController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CategoryController.java @@ -30,6 +30,7 @@ public class CategoryController { String errMsg = validateCategoryCreateParam(category); if (errMsg != null) return R.fail(errMsg); + category.setId(null); category.setCtime(System.currentTimeMillis()); return service.add(category); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CustomerController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CustomerController.java index 70a9755..16ca7f3 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CustomerController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CustomerController.java @@ -32,6 +32,7 @@ public class CustomerController { customer.setId(null); customer.setCtime(System.currentTimeMillis()); + return service.add(customer); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/DepartmentController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/DepartmentController.java index dc8867d..1fca148 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/DepartmentController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/DepartmentController.java @@ -34,6 +34,9 @@ public class DepartmentController { if (null == department.getPid() || StringUtils.isEmpty(department.getName())) { return R.fail("添加失败，参数错误"); } + + department.setId(null); + return service.add(department); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java index 35867d3..440a9da 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java @@ -35,6 +35,7 @@ public class RoleController { UserVo user = SessionUtil.get(); + role.setId(null); role.setCid(user.getId()); role.setCname(user.getName()); role.setCtime(System.currentTimeMillis()); diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/SupplierController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/SupplierController.java index 97dd293..edecc06 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/SupplierController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/SupplierController.java @@ -32,6 +32,7 @@ public class SupplierController { supplier.setId(null); supplier.setCtime(System.currentTimeMillis()); + return service.add(supplier); }