fix

多租户菜单修复

tr-framework/src/main/java/cn/tr/core/tenant/TenantContextHolder.java

@@ -1,6 +1,8 @@
 package cn.tr.core.tenant;
 
+import cn.hutool.core.util.StrUtil;
 import cn.tr.core.context.SecurityContextHolder;
+import cn.tr.core.strategy.LoginUserStrategy;
 
 /**
  * 多租户上下文 Holder
@@ -8,14 +10,19 @@ import cn.tr.core.context.SecurityContextHolder;
  * @author tr
  */
 public class TenantContextHolder {
-
     /**
      * 获得租户编号。
      *
      * @return 租户编号
      */
     public static String getTenantId() {
-        return SecurityContextHolder.getStr(TenantConstant.TENANT_ID);
+        String result = SecurityContextHolder.getStr(TenantConstant.TENANT_ID);
+        if(StrUtil.isNotBlank(result)){
+            return result;
+        }
+        result= LoginUserStrategy.tr.getTenantId();
+        setTenantId(result);
+        return result;
     }
 
     /**

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizClinicRepository.java

@@ -1,7 +1,5 @@
 package cn.tr.module.smart.common.repository;
 
-import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
-import cn.tr.module.smart.wx.vo.BizWxAppletClinicVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,7 +18,6 @@ import java.util.List;
 @Repository
 @Mapper
 public interface BizClinicRepository extends BaseMapper<BizClinicPO> {
-    List<BizWxAppletClinicVO> stdSelectWxAppletList(@Param("query") BizWxAppletClinicQueryDTO query);
 
     @Update(
             "update biz_clinic set care = 0 where wx_user_id = #{userId}}"

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.tr.module.smart.common.repository.BizClinicRepository">
 
-    <resultMap id="stdWxAppletResult" type="cn.tr.module.smart.wx.vo.BizWxAppletClinicVO">
+    <resultMap id="stdWxAppletResult" type="cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO">
         <result property="id" column="id"/>
         <result property="patientName" column="patientName"/>
         <result property="patientAge" column="patientAge"/>
@@ -17,7 +17,4 @@
         <result property="care" column="care"/>
 
     </resultMap>
-    <select id="stdSelectWxAppletList" resultMap="stdWxAppletResult">
-
-    </select>
 </mapper>