1.拦截器多个sql key被清空问题

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -937,9 +937,6 @@ LEFT JOIN (
                     AND ( usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
                 </otherwise>
             </choose>
-            <if test="bizOrgCode != null and bizOrgCode != ''">
-                AND usr.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
-            </if>
             order by usr.rec_date
         </where>
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1739,9 +1739,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
+		String authKey = PermissionInterceptorContext.getDataAuthRule();
 		Map<String, Object> param = new HashMap<>();
 		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
-
+		PermissionInterceptorContext.clean();
 		if (StringUtils.isNotEmpty(type) && type.equals("COMPANY")){
 			//查询当前登录人所属单位/部门
 			OrgUsr orgUsr = orgUsrMapper.selectById(reginParams.getPersonIdentity().getCompanyId());
@@ -1754,6 +1755,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				}
 			}
 		}
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		param.put("bizOrgCode", bizOrgCode);
 		param.put("type", type);
 		List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);