fix 部门导入

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java

@@ -239,6 +239,8 @@ public interface CommonConstant {
     public static final String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code";
     /** sys_depart 表 code 唯一键索引 */
     public static final String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code";
+    /** sys_depart 表 部门名称 唯一键索引 */
+    public static final String SQL_INDEX_UNIQ_DEPART_DEPART_NAME = "uniq_depart_depart_name";
     /**
      * 在线聊天 是否为默认分组
      */

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java

@@ -1,6 +1,7 @@
 package com.jero.common.system.vo;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -41,7 +42,7 @@ public class SysDepartTreeModel implements Serializable{
 
     private String departNameAbbr;
 
-    private Integer departOrder;
+    private BigDecimal departOrder;
 
     private String description;
     
@@ -224,11 +225,11 @@ public class SysDepartTreeModel implements Serializable{
         this.departNameAbbr = departNameAbbr;
     }
 
-    public Integer getDepartOrder() {
+    public BigDecimal getDepartOrder() {
         return departOrder;
     }
 
-    public void setDepartOrder(Integer departOrder) {
+    public void setDepartOrder(BigDecimal departOrder) {
         this.departOrder = departOrder;
     }
 

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java

@@ -69,10 +69,7 @@ public class ImportExcelUtil {
     public static List<String> importDateSaveOne(Object obj, Class serviceClass,List<String> errorMessage,int i,String errorFlag)  {
         IService bean =(IService) SpringContextUtils.getBean(serviceClass);
         try {
-            boolean save = bean.save(obj);
-            if(!save){
-                throw new Exception(errorFlag);
-            }
+            bean.save(obj);
         } catch (Exception e) {
             String message = e.getMessage().toLowerCase();
             int lineNumber = i + 1;
@@ -85,6 +82,8 @@ public class ImportExcelUtil {
                 errorMessage.add("第 " + lineNumber + " 行：职务编码已经存在，忽略导入。");
             }else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_DEPART_ORG_CODE)) {
                 errorMessage.add("第 " + lineNumber + " 行：部门编码已经存在，忽略导入。");
+            }else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_DEPART_DEPART_NAME)) {
+                errorMessage.add("第 " + lineNumber + " 行：部门名称已经存在，忽略导入。");
             }else {
                 errorMessage.add("第 " + lineNumber + " 行：未知错误，忽略导入");
                 log.error(e.getMessage(), e);