Parcourir la source

处理组织模块启动报错

wany il y a 1 an
Parent
commit
7e07771c80

+ 2 - 1
kirin_app/src/main/java/com/kingtom/kirin/app/org/service/IOrgService.java

@@ -10,6 +10,7 @@ import com.kingtom.kirin.app.org.model.OrgStruct;
 import com.kingtom.kirin.app.org.model.OrgUnit;
 import com.kingtom.kirin.app.org.model.OrgUnitExample;
 import com.kingtom.kirin.core.common.CommonConst;
+import com.kingtom.kirin.core.common.utils.CollectionUtils;
 
 /**
  * 组织模块</p>
@@ -31,7 +32,7 @@ public interface IOrgService extends IOrgPersonService, IOrgUnitService, IOrgStr
         OrgUnitExample example = new OrgUnitExample();
         example.setOrderByClause("gmt_create asc");
         List<OrgUnit> orgUnits = findUnitList(example);
-        return orgUnits.get(CommonConst.INT_0);
+        return CollectionUtils.isEmpty(orgUnits) ? null : orgUnits.get(CommonConst.INT_0);
     }
 
     /**

+ 1 - 1
kirin_app/src/main/java/com/kingtom/kirin/app/org/service/OrgInitService.java

@@ -32,7 +32,7 @@ public class OrgInitService{
 
     @PostConstruct
     public void init(){
-        if(orgService.findDefaultUnit() == null){
+        if(orgService.findDefaultUnit() != null){
             return;
         }
         OrgPerson legal = orgService.findPersonByPhone(orgInitProperties.getLegalPhone());