1.移动端添加自定义navbar导航栏

zhuguifei

2025-05-20 7fe7b6182c2d407d28c2c9da1c070c3ce964e3e7

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsRepairResServiceImpl.java

@@ -69,13 +69,18 @@

            if(reqVo.getEquId()!=null){
                EimsEquVo equVo = equMapper.selectVoById(reqVo.getEquId());
                resVo.setAssetNo(equVo.getAssetNo());
                resVo.setEquName(equVo.getEquName());
                if(equVo!=null){
                    resVo.setAssetNo(equVo.getAssetNo());
                    resVo.setEquName(equVo.getEquName());
                }

            }
            if(reqVo.getFixtureId()!=null){
                EimsFixtureVo fixtureVo = fixtureMapper.selectVoById(reqVo.getFixtureId());
                resVo.setFixtureName(fixtureVo.getFixtureName());
                resVo.setAssetNo(fixtureVo.getAssetNo());
                if(fixtureVo!=null){
                    resVo.setFixtureName(fixtureVo.getFixtureName());
                    resVo.setAssetNo(fixtureVo.getAssetNo());
                }
            }


@@ -298,6 +303,9 @@
        qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
        qw.eq(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());

        qw.between(params.get("beginReqTime") != null && params.get("endReqTime") != null,
            "req.req_time", params.get("beginReqTime"), params.get("endReqTime"));

        List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
        qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);