expert_management.git

			@@ -18,7 +18,7 @@
			<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
			<java.version>1.8</java.version>
			<mybatis.boot.version>1.3.2</mybatis.boot.version>
			<druid.version>1.1.14</druid.version>
			<druid.version>1.1.23</druid.version>
			<bitwalker.version>1.19</bitwalker.version>
			<swagger.version>2.9.2</swagger.version>
			<kaptcha.version>2.3.2</kaptcha.version>

			@@ -79,14 +79,11 @@
			}
			// 获取当前的用户
			LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
			if (loginUser == null) {
			return;
			}
			SysUser currentUser = loginUser.getUser();
			if (currentUser != null)
			if (StringUtils.isNotNull(loginUser))
			{
			SysUser currentUser = loginUser.getUser();
			// 如果是超级管理员，则不过滤数据
			if (!currentUser.isAdmin())
			if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
			{
			dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
			controllerDataScope.userAlias());

			@@ -76,12 +76,12 @@
			public List<SysDictData> selectDictDataByType(String dictType)
			{
			List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
			if (null!=dictDatas&&!dictDatas.isEmpty())
			if (StringUtils.isNotEmpty(dictDatas))
			{
			return dictDatas;
			}
			dictDatas = dictDataMapper.selectDictDataByType(dictType);
			if (null!=dictDatas&&!dictDatas.isEmpty())
			if (StringUtils.isNotEmpty(dictDatas))
			{
			DictUtils.setDictCache(dictType, dictDatas);
			return dictDatas;

	pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史