Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java

@@ -119,6 +119,12 @@ public class SysFileServiceImpl implements ISysFileService {
         SysDictionary dictionary = sysDictionaryRDao.getByProperty(new String[]{"parentCodeRdd","dictionaryValue"},
                 new Object[]{BaseConstWords.DICTIONARY_FILE_TYPE, fastDFSFile.getExt()});
 
+        if(dictionary == null){
+            dictionary = sysDictionaryRDao.getByProperty(new String[]{"parentCodeRdd","dictionaryValue"},
+                    new Object[]{BaseConstWords.DICTIONARY_FILE_TYPE, "."+fastDFSFile.getExt()});
+        }
+
+
         SysFile sysFile = new SysFile();
         sysFile.setDfsGroupName(fileAbsolutePath[0]);
         sysFile.setDfsFileName(fileAbsolutePath[1]);