Commit 4433e2e8 authored by 李腾威's avatar 李腾威

修改禅道BUG 2565

parent 19d0d972
...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.Menu; import com.yeejoin.amos.boot.biz.common.utils.Menu;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom; import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser; import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
...@@ -56,6 +58,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire ...@@ -56,6 +58,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
@Autowired @Autowired
OrgUsrServiceImpl orgUsrService; OrgUsrServiceImpl orgUsrService;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
/** /**
* 获取监控大队列表 * 获取监控大队列表
* *
...@@ -185,6 +190,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire ...@@ -185,6 +190,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
FireTeam parentTeam = getById(fireTeam.getParent()); FireTeam parentTeam = getById(fireTeam.getParent());
fireTeam.setTreeCode(parentTeam.getTreeCode() + TreeParser.genTreeCode()); fireTeam.setTreeCode(parentTeam.getTreeCode() + TreeParser.genTreeCode());
} }
DataDictionary dataDictionary = iDataDictionaryService.getById(fireTeam.getTypeCode());
if(null !=dataDictionary ) {
fireTeam.setType(dataDictionary.getName());
}
if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())) { if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())) {
save(fireTeam); save(fireTeam);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment