SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #220.
This commit is contained in:
hejinbo
2023-11-20 10:46:29 +08:00
committed by Gitea
parent a99e281f8a 440e895c51
commit b3a2a2af3e
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java
+1 -6
View File
@@ -447,17 +447,11 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
@Override @Override
public List<TemplateManage> getTemplateList(DeptIdentify deptIdentify) { public List<TemplateManage> getTemplateList(DeptIdentify deptIdentify) {
if (deptIdentify.getId() == null) {
return null;
}
TemplateManage templateManage = new TemplateManage(); TemplateManage templateManage = new TemplateManage();
templateManage.setIdentifyId(deptIdentify.getId()); templateManage.setIdentifyId(deptIdentify.getId());
List<TemplateManage> templateManages = templateManageMapper.selectTemplateList(templateManage); List<TemplateManage> templateManages = templateManageMapper.selectTemplateList(templateManage);
if (templateManages != null && templateManages.size() > 0) {
return templateManages; return templateManages;
} }
return null;
}
private String generateUniqueUsername() { private String generateUniqueUsername() {
final Random random = new Random(); final Random random = new Random();
@@ -472,6 +466,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
} }
} }
} }
private String getFileExtension(String fileName) { private String getFileExtension(String fileName) {
int lastDotIndex = fileName.lastIndexOf("."); int lastDotIndex = fileName.lastIndexOf(".");
if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) { if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) {