From bedb22d27ab3f4cf4eb0c72025c0fe029c8edcb9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 11 Jan 2023 10:26:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=BE=E5=9B=9E?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java     | 3 ++-
 .../src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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..33f5669 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
@@ -3,6 +3,7 @@ package com.glxp.sale.admin.dao.auth;
 import com.glxp.sale.admin.entity.auth.UserRegisterEntity;
 import com.glxp.sale.admin.req.auth.UserResisterFilterRequest;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,7 +20,7 @@ public interface UserRegisterDao {
 
     UserRegisterEntity selectById(Integer id);
 
-    UserRegisterEntity selectByCustomerId(Long id);
+    UserRegisterEntity selectByCustomerId(@Param("userId") Long userId);
 
     UserRegisterEntity selectByMobile(String phone);
 
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..3197afb 100644
--- a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml
@@ -86,7 +86,7 @@
         WHERE mobile = #{phone}
     </select>
 
-    <select id="selectByCustomerId" parameterType="java.lang.String"
+    <select id="selectByCustomerId" parameterType="java.lang.Long"
             resultType="com.glxp.sale.admin.entity.auth.UserRegisterEntity">
         SELECT *
         FROM user_register

From 68bf81b44714d413ab9ee4d83b9c7449b0cadf90 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 12 Jan 2023 11:46:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/sale/admin/controller/auth/RegisterController.java    | 3 ++-
 .../java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java     | 2 +-
 .../com/glxp/sale/admin/service/auth/UserRegisterService.java  | 2 +-
 .../sale/admin/service/auth/impl/UserRegisterServiceImpl.java  | 2 +-
 api-admin/src/main/resources/application-dev.properties        | 2 +-
 .../src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

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/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/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index 5438063..91dc756 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9996
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms_za?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
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}
     </select>
 
     <select id="isExit" parameterType="java.lang.String" resultType="java.lang.String">

From 1bfd60a60ec787329a94f5f84b8a6657a65b0c2c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 12 Jan 2023 11:50:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java | 2 +-
 .../src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml
index f1e7c43..f92fbce 100644
--- a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml
@@ -86,7 +86,7 @@
         WHERE mobile = #{phone}
     </select>
 
-    <select id="selectByCustomerId" parameterType="java.lang.Long"
+    <select id="selectByCustomerId" parameterType="java.lang.String"
             resultType="com.glxp.sale.admin.entity.auth.UserRegisterEntity">
         SELECT *
         FROM user_register

From 50d627a4ee52d0f8380e1232a059f2093e9db3fa Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 12 Jan 2023 16:17:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.=E5=8E=BB=E9=99=A4=E8=A2=AB=E6=8B=89?=
 =?UTF-8?q?=E5=8F=96=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/admin/controller/basic/BussinessTypeController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {