Merge remote-tracking branch 'origin/busUser' into busUser

# Conflicts:
#	api-admin/src/main/resources/application-dev.properties

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

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

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

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);
 }

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);
     }
 }

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">