Bladeren bron

Merge branch 'feature/0721-tenant'

Eric 1 jaar geleden
bovenliggende
commit
c5ff899b2b

+ 8 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantApplyRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
@@ -128,6 +129,13 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
             throw new BizException("该手机号已经有机构账户");
         }
 
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.lambda().eq(SysUser::getPhone, tenantApply.getPhone());
+        List<SysUser> sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+        if (!sysUsers.isEmpty() && sysUsers.stream().anyMatch(next -> next.getUserType().contains(ClientEnum.SYSTEM.getCode()))) {
+            throw new BizException("该手机号已经有系统员工账户");
+        }
+
         // 查询申请记录 是否存在正在申请中的
         TenantApplyRecord record = this.lambdaQuery()
                 .eq(TenantApplyRecord::getPhone, tenantApply.getPhone())

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -227,7 +227,7 @@
         SELECT
         <include refid="baseColumns"/>,
         if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
-        u.avatar_ as avatar,
+        if(t.avatar_ = '' OR t.avatar_ = NULL, u.avatar_, t.avatar_) as avatar,
         u.username_ as username,
         u.gender_ as `gender`,
         u.birthdate_ as birthdate,