|
@@ -49,7 +49,12 @@ public class IotHazardServiceImpl implements IotHazardService {
|
|
|
iotHazard.setDeleted(false);
|
|
iotHazard.setDeleted(false);
|
|
|
//未整改
|
|
//未整改
|
|
|
iotHazard.setStatus("todo");
|
|
iotHazard.setStatus("todo");
|
|
|
- Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
|
|
|
|
|
|
|
+ Long deptId;
|
|
|
|
|
+ if (createReqVO.getDeptId()==null) {
|
|
|
|
|
+ deptId = SecurityFrameworkUtils.getLoginUserDeptId();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ deptId = createReqVO.getDeptId();
|
|
|
|
|
+ }
|
|
|
iotHazard.setDeptId(deptId);
|
|
iotHazard.setDeptId(deptId);
|
|
|
if (Objects.nonNull(createReqVO.getClassify())&& StringUtils.isNotBlank(createReqVO.getClassify())) {
|
|
if (Objects.nonNull(createReqVO.getClassify())&& StringUtils.isNotBlank(createReqVO.getClassify())) {
|
|
|
IotHazardTypeDO iotHazardTypeDO = iotHazardTypeMapper.selectById(Long.valueOf(createReqVO.getClassify()));
|
|
IotHazardTypeDO iotHazardTypeDO = iotHazardTypeMapper.selectById(Long.valueOf(createReqVO.getClassify()));
|
|
@@ -65,6 +70,13 @@ public class IotHazardServiceImpl implements IotHazardService {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public void updateIotHazard(IotHazardSaveReqVO updateReqVO) {
|
|
public void updateIotHazard(IotHazardSaveReqVO updateReqVO) {
|
|
|
|
|
+ Long deptId;
|
|
|
|
|
+ if (updateReqVO.getDeptId()==null) {
|
|
|
|
|
+ deptId = SecurityFrameworkUtils.getLoginUserDeptId();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ deptId = updateReqVO.getDeptId();
|
|
|
|
|
+ }
|
|
|
|
|
+ updateReqVO.setDeptId(deptId);
|
|
|
// 校验存在
|
|
// 校验存在
|
|
|
validateIotHazardExists(updateReqVO.getId());
|
|
validateIotHazardExists(updateReqVO.getId());
|
|
|
// 更新
|
|
// 更新
|