修改

jinlin

2025-04-05 92705ac08a97ddc4904795f024723aab69e1abd8

 src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java

@@ -58,7 +58,7 @@
    private SysTeamGroupClassService sysTeamGroupClassService;


    public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status, String name) {
    public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status,Integer isealCabin, String name) {
        Long userId = null;
       /* Map adminRole = sysUserService.adminRole();
        Object isTyRole = adminRole.get("isTyRole");
@@ -66,7 +66,7 @@
        if (isTyRole.equals(true) || isYwzRole.equals(true)) {
            userId =  UserContext.getUser().getId();
        }*/
        List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, name);
        List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, isealCabin,name);
        /*if (list != null && list.size() > 0) {
            sysOssService.setListOsses(list, "ProjectProgressFileUpload");
        }*/
@@ -480,15 +480,15 @@
                }

                if (StringUtils.isNotBlank(trackedPerson)) {
                    data.setTrackPerson(trackPersonStr);
                    data.setTrackedPerson(trackedPerson);
                }

                if (StringUtils.isNotBlank(trackedPersonContact)) {
                    data.setTrackPersonContact(trackPersonContact);
                    data.setTrackedPersonContact(trackedPersonContact);
                }

                if (StringUtils.isNotBlank(trackedPersonUnit)) {
                    data.setTrackPersonUnit(trackPersonUnit);
                    data.setTrackedPersonUnit(trackedPersonUnit);
                }
                if (StringUtils.isNotBlank(generalRepairUnit)) {
                    data.setGeneralRepairUnit(generalRepairUnit);