车间能级提升-智能设备管理系统
zhuguifei
2025-05-14 cb19937239b42f51c6e8525450d08e93225117bc
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());
                }
            }
@@ -296,6 +301,7 @@
        qw.eq(bo.getResUser() != null, "res.res_user", bo.getResUser());
        qw.eq(bo.getReqType() != null, "req.req_type", bo.getReqType());
        qw.eq(bo.getReqUser() != null, "res.req_user", bo.getReqUser());
        qw.eq(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
        List<Long> resDeptIds = getAllDescendantIds(bo.getResDept());
        qw.in(bo.getResDept() != null, "res.res_dept", resDeptIds);