From 256ea64d2546766dc4349b7b644feede80892f9a Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 14 Jul 2023 09:37:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=20=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E6=97=B6=E6=8F=90=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/dao/inout/IoOrderDao.java | 2 ++ .../service/inv/impl/InvPreInProductDetailServiceImpl.java | 7 ++++++- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index ad9882b8..f4f1f963 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -63,4 +63,6 @@ public interface IoOrderDao extends BaseMapperPlus().select("createTime").eq("billNo", response.getOrderId())); - response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + if (order!=null){ + response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + } + +// response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss")); } @Override diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 9ef6ab5e..a1351221 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -556,4 +556,6 @@ + + From 58bd268f47d2f2d1eca4a42ee1732cef2bde8606 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Fri, 14 Jul 2023 09:54:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=20=E5=B0=86=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=A6=81=E7=94=A8=E5=90=8E=E8=BF=98=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/sup/CustomerController.java | 4 ++++ src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sup/CustomerController.java b/src/main/java/com/glxp/api/controller/sup/CustomerController.java index 6c301b06..393b260d 100644 --- a/src/main/java/com/glxp/api/controller/sup/CustomerController.java +++ b/src/main/java/com/glxp/api/controller/sup/CustomerController.java @@ -113,6 +113,10 @@ public class CustomerController { List objects = new ArrayList<>(); if( byCustomerld !=null && byCustomerld.size()>0){ for (AuthAdmin authAdmin : byCustomerld) { + //修改关联的用户状态 + authAdmin.setUserFlag(customerDetailEntity.getUserFlag()); + authAdminService.updateAuthAdmin(authAdmin); + List authRoleAdmins = authRoleAdminService.listByAdminId(authAdmin.getId()); if(authRoleAdmins!=null && authRoleAdmins.size()>0) { authRoleAdmin.setRole_id(Long.valueOf(customerDetailEntity.getRoleId())); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index fb988c1e..6993ad14 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -509,7 +509,6 @@ basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy, - basic_products.zdcfsycs, basic_products.sfwwjbz, basic_products.syqsfxyjxmj, basic_products.mjfs,