Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

8 天以前 330fcece11892289f2936ec8e11e4c8a610d5bab

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -103,6 +103,9 @@
    @Autowired
    private DingTalk dingTalk;

    @Autowired
    private DdNoticeConfigMapper ddNoticeConfigMapper;


    @Override
    public Integer create(HiddenDanger hiddenDanger) {
@@ -255,7 +258,10 @@
        if(StringUtils.isNotBlank(member.getDdId())){
            dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
                    member.getDdId(),
                    dingTalk.getHiddenDangerNoticeMsg(hiddenDanger));
                    ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
                            .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
                            .eq(DdNoticeConfig::getObjType,14))>Constants.ZERO?
                    dingTalk.getHiddenDangerNoticeMsg(hiddenDanger):null);
        }

        return hiddenDanger.getId();
@@ -809,7 +815,10 @@
        if(StringUtils.isNotBlank(member.getDdId())){
            dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
                    member.getDdId(),
                    dingTalk.getHiddenDangerNoticeMsg(hiddenDanger));
                    ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
                            .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
                            .eq(DdNoticeConfig::getObjType,14))>Constants.ZERO?
                            dingTalk.getHiddenDangerNoticeMsg(hiddenDanger):null);
        }

    }