Merge branch 'feature/1026-tenantalbum' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -200,7 +200,8 @@ public class TenantInfoController extends BaseController {
 
                 // 平台员工不允许重复
                 SysUser employee = employeeService.queryUserByMobile(sysUser.getPhone());
-                if (Objects.nonNull(employee)) {
+                if (Objects.nonNull(employee) && employee.getPhone().equals(sysUser.getPhone())
+                        && employee.getUserType().contains(ClientEnum.SYSTEM.getCode())) {
                     throw new BizException("当前手机号已绑定平台员工");
                 }
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -200,7 +200,8 @@ public class TenantInfoController extends BaseController {
 
                 // 平台员工不允许重复
                 SysUser employee = employeeService.queryUserByMobile(sysUser.getPhone());
-                if (Objects.nonNull(employee)) {
+                if (Objects.nonNull(employee) && employee.getPhone().equals(sysUser.getPhone())
+                        && employee.getUserType().contains(ClientEnum.SYSTEM.getCode())) {
                     throw new BizException("当前手机号已绑定平台员工");
                 }