From b7bfdeeeaf263afaeb67a0dc491efecf99da87e0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 23 Mar 2023 10:44:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/basic/UdiRlSupController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 778f0060..3c6aaae2 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -237,7 +237,7 @@ public class UdiRlSupController extends BaseController { udiRelevanceEntity.setLockStatus(1); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(udiProductEntity, udiInfoExportRequest.getSupplementRequest()); + BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(),udiProductEntity); udiProductService.insertUdiInfo(udiProductEntity); return ResultVOUtils.success("选入成功！"); } From 3b362f484df8ef176e8ab879ac5decb41f36387c Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 23 Mar 2023 11:03:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index ec10376c..7cd8d15c 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -358,7 +358,7 @@ auth_dept.name warehouseName from auth_warehouse inner join auth_dept on auth_warehouse.parentId = auth_dept.code - inner join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code + LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code AND auth_warehouse_user.userId = #{userId} From 506b62c19ae965d5ab8a35fa43f43b35a00fe07f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 23 Mar 2023 11:27:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/controller/auth/DeptController.java | 1 + src/main/resources/mybatis/mapper/auth/DeptDao.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 79586d03..b87a78cc 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -160,6 +160,7 @@ public class DeptController extends BaseController { } filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setSpUse(true); invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); diff --git a/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 9662d799..f9d1b290 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -78,7 +78,7 @@ AND `level` = #{level} - AND spUse = #{spUse} + AND auth_dept.spUse = #{spUse} group by auth_dept.code From 1635adae874ed5dae2c372053c6978137ee4e97f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 23 Mar 2023 11:57:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/RegisterController.java | 6 +++++- src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java | 4 ++++ .../com/glxp/api/service/auth/UserRegisterService.java | 2 ++ .../api/service/auth/impl/UserRegisterServiceImpl.java | 5 +++++ .../resources/mybatis/mapper/auth/UserRegisterDao.xml | 8 ++++++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index dbcbb738..27d05604 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -246,10 +246,14 @@ public class RegisterController { if (StrUtil.isNotBlank(company_check) && company_check.equals("1")) { //新用户注册时根据往来单位字典进行企业名称校验 CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(userRegisterEntity.getCompanyId()); - if (customerInfoEntity != null) { + if (customerInfoEntity != null ) { return ResultVOUtils.error(500, "该企业已被注册！"); } } + UserRegisterEntity userRegisterEntity2 = userRegisterService.selectByCname(userRegisterEntity.getCompanyName()); + if (userRegisterEntity2 !=null ) { + return ResultVOUtils.error(500, "该企业已被注册！"); + } userRegisterEntity.setRegisterTime(DateUtil.getDateTime()); userRegisterEntity.setCheckType(0);//未审核 diff --git a/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java b/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java index 14605e9f..c92c428b 100644 --- a/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java +++ b/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java @@ -12,6 +12,10 @@ public interface UserRegisterDao { List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest); + UserRegisterEntity selectByCname(String cName); + + + boolean insertUserRegister(UserRegisterEntity userRegisterEntity); boolean updateUserRegister(UserRegisterEntity userRegisterEntity); diff --git a/src/main/java/com/glxp/api/service/auth/UserRegisterService.java b/src/main/java/com/glxp/api/service/auth/UserRegisterService.java index 5fd0441f..2966b10b 100644 --- a/src/main/java/com/glxp/api/service/auth/UserRegisterService.java +++ b/src/main/java/com/glxp/api/service/auth/UserRegisterService.java @@ -11,6 +11,8 @@ public interface UserRegisterService { boolean insertUserRegister(UserRegisterEntity userRegisterEntity); + UserRegisterEntity selectByCname(String cName); + boolean updateUserRegister(UserRegisterEntity userRegisterEntity); boolean deleteById(Long id); diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java index 25e91d76..68869016 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java @@ -33,6 +33,11 @@ public class UserRegisterServiceImpl implements UserRegisterService { return userRegisterDao.insertUserRegister(userRegisterEntity); } + @Override + public UserRegisterEntity selectByCname(String cName) { + return userRegisterDao.selectByCname(cName); + } + @Override public boolean updateUserRegister(UserRegisterEntity userRegisterEntity) { return userRegisterDao.updateUserRegister(userRegisterEntity); diff --git a/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml index 762c2e34..c5d3d252 100644 --- a/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml +++ b/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -17,6 +17,14 @@ + + + INSERT INTO user_register From baf0c90bdbdb03f200a95bc196229a5eaa596f93 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 23 Mar 2023 13:56:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/InvWarehouseController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 18022e5c..6a639b98 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -109,6 +109,7 @@ public class InvWarehouseController extends BaseController { } else { filterInvWarehouseRequest.setUserId(null); } + filterInvWarehouseRequest.setSpUse(true); List invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); return ResultVOUtils.success(invSubWarehouseEntities); }