因子默认单位添加；角色、菜单更新

lizijie

2021-09-03 659b91b554ba5e98b6fffa045231f5aa3fb4ab9e

 screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java

@@ -14,6 +14,7 @@
import com.moral.api.pojo.form.version.*;
import com.moral.api.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.CacheUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
@@ -100,7 +101,7 @@
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    
    @Override
    @Transactional
    public VersionDTO update(VersionUpdateForm form) {
@@ -167,6 +168,7 @@
        Integer id = form.getId();
        //查询型号是否被使用，如果被使用则无法删除
        QueryWrapper<OrganizationUnitAlarm> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("id");
        queryWrapper.eq("is_delete", Constants.NOT_DELETE);
        queryWrapper.eq("version_id", id);
        List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryWrapper);
@@ -265,6 +267,8 @@
                organizationUnitAlarmMapper.insert(organizationUnitAlarm);
            }
        }
        //刷新deviceInfo缓存
        CacheUtils.refreshDeviceAlarmInfo();
        //封装返回结果
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -344,5 +348,5 @@
        return dto;
    }


}