Merge branch 'develop' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -197,6 +197,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 .set(TenantActivationCode::getActivationUserId, student.getUserId())
                 .set(TenantActivationCode::getActivationTime, new Date())
                 .set(TenantActivationCode::getActivationPhone, sysUser.getPhone())
+                .set(TenantActivationCode::getSendStatus, EActivationCode.SEND)
                 .eq(TenantActivationCode::getId, code.getId())
                 .eq(TenantActivationCode::getActivationStatus, false)
                 .update();

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantPersonStatMapper.xml

@@ -14,7 +14,7 @@
         </sql> 
     
     <select id="init" resultType="com.yonge.cooleshow.biz.dal.entity.TenantPersonStat">
-        select ti.id_ tenantId,COUNT(s.user_id_) studentNum,COUNT(t.user_id_) teacherNum from tenant_info ti
+        select ti.id_ tenantId,COUNT(distinct s.user_id_) studentNum,COUNT(distinct t.user_id_) teacherNum from tenant_info ti
         left join student s ON s.tenant_id_ = ti.id_ AND s.lock_flag_ = 0
         left join teacher t ON t.tenant_id_ = ti.id_ AND t.lock_flag_ = 0
         group by ti.id_