Commit bd34f4a7 authored by chenhao's avatar chenhao

设置单位下没有120急救站时不显示当前部门在excle魔板中

parent 6ef3f09b
......@@ -18,6 +18,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
import com.yeejoin.amos.boot.module.common.api.service.IDutyFirstAidService;
import ch.qos.logback.core.joran.conditional.IfAction;
@Service
public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements IDutyFirstAidService {
......@@ -141,8 +143,10 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
String firstAidNameString = m.get("name").toString() + "@" + m.get("sequence_nbr").toString();
firstAidSimpleList.add(firstAidNameString);
});
detailMap.put("firstAidName", firstAidSimpleList);
resultList.add(detailMap);
if( firstAidSimpleList != null && firstAidSimpleList.size() > 1 ) {
detailMap.put("firstAidName", firstAidSimpleList);
resultList.add(detailMap);
}
});
return resultList;
}
......
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