diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index d214be8..f04703b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -98,7 +98,8 @@ public class RegisterController { if (authAdmin == null) { return ResultVOUtils.error(500, "未找到该用户"); } - UserRegisterEntity userRegisterEntity = userRegisterService.selectByCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); + String a= String.valueOf(authAdmin.getCustomerId()); + UserRegisterEntity userRegisterEntity = userRegisterService.selectByCustomerId(String.valueOf(authAdmin.getCustomerId())); if (!userRegisterEntity.getMobile().equals(checkCodeRequest.getPhoneNum())) { CustomerContactEntity customerContactEntity = customerContactService.selectById(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); if (customerContactEntity != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index e123aca..bfd3cf8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -186,7 +186,7 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } - @AuthRuleAnnotation("") + //@AuthRuleAnnotation("") @GetMapping("/udiwms/bussinessType/udimsFilter") public BaseResponse udimsFilter(UdimsFilterRequest udimsFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java index 259259a..d2a86fd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java @@ -19,7 +19,7 @@ public interface UserRegisterDao { UserRegisterEntity selectById(Integer id); - UserRegisterEntity selectByCustomerId(Long id); + UserRegisterEntity selectByCustomerId(String id); UserRegisterEntity selectByMobile(String phone); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java index c2fea15..176bcc6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java @@ -23,5 +23,5 @@ public interface UserRegisterService { boolean deleteByCustomerId(Long id); - UserRegisterEntity selectByCustomerId(Long id); + UserRegisterEntity selectByCustomerId(String id); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java index 60b2ae9..f14d3d2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java @@ -69,7 +69,7 @@ public class UserRegisterServiceImpl implements UserRegisterService { } @Override - public UserRegisterEntity selectByCustomerId(Long id) { + public UserRegisterEntity selectByCustomerId(String id) { return userRegisterDao.selectByCustomerId(id); } } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml index 0624f81..f92fbce 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -90,7 +90,7 @@ resultType="com.glxp.sale.admin.entity.auth.UserRegisterEntity"> SELECT * FROM user_register - WHERE userId = #{userId} + WHERE companyId = #{id}