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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java

@@ -375,12 +375,12 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
     }
 
     @Override
-    public AjaxResult insertTemplate(TemplateManage templateManage , MultipartFile file) {
+    public AjaxResult insertTemplate(TemplateManage templateManage, MultipartFile file) {
         //参数校验
-        if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null){
+        if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null) {
             return AjaxResult.error("请检查参数是否完整");
         }
-        if (templateManage.getTemType() == null){
+        if (templateManage.getTemType() == null) {
             templateManage.setTemType(1); //默认模板类型为1(裁决书)
         }
         try {
@@ -396,7 +396,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
             templateManage.setTemFormat(format);
             templateManage.setCreateBy(getUsername());
             int i = templateManageMapper.insertTemplateManage(templateManage);
-            if (i>0){
+            if (i > 0) {
                 return AjaxResult.success("新增成功");
             }
         } catch (IOException e) {
@@ -424,7 +424,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
             templateManage.setTemFormat(format);
             templateManage.setUpdateBy(getUsername());
             int i = templateManageMapper.updateTemplateManage(templateManage);
-            if (i>0){
+            if (i > 0) {
                 return AjaxResult.success("修改成功");
             }
         } catch (IOException e) {
@@ -447,16 +447,10 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
 
     @Override
     public List<TemplateManage> getTemplateList(DeptIdentify deptIdentify) {
-        if (deptIdentify.getId() == null) {
-            return null;
-        }
         TemplateManage templateManage = new TemplateManage();
         templateManage.setIdentifyId(deptIdentify.getId());
         List<TemplateManage> templateManages = templateManageMapper.selectTemplateList(templateManage);
-        if (templateManages != null && templateManages.size() > 0) {
-            return templateManages;
-        }
-      return null;
+        return templateManages;
     }
 
     private String generateUniqueUsername() {
@@ -472,7 +466,8 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
             }
         }
     }
-    private  String getFileExtension(String fileName) {
+
+    private String getFileExtension(String fileName) {
         int lastDotIndex = fileName.lastIndexOf(".");
         if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) {
             return fileName.substring(lastDotIndex + 1);