|
@@ -132,6 +132,11 @@ public class DisScaleFacade extends DisScaleServiceImpl {
|
|
|
disScaleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("dis_id", getDisScaleByDisIdVO.getDisId());
|
|
|
List<DisScale> disScales = this.list(disScaleQueryWrapper);
|
|
|
+ //如果查不到则关联信息已被删除
|
|
|
+ if(ListUtil.isEmpty(disScales)){
|
|
|
+ throw new CommonException(CommonErrorCode.NOT_EXISTS,
|
|
|
+ "关联信息系不存在,请添加关联");
|
|
|
+ }
|
|
|
List<Long> questionIds = new ArrayList<>();
|
|
|
List<GetDisScaleAllInfoDTO> getDisScaleAllInfoDTOS = BeanUtil.listCopyTo(disScales, GetDisScaleAllInfoDTO.class);
|
|
|
for (DisScale disScale : disScales) {
|
|
@@ -160,6 +165,7 @@ public class DisScaleFacade extends DisScaleServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public Boolean delDisScaleInfo(DelDisScaleInfoVO delDisScaleInfoVO){
|
|
|
+ //判断关联信息是否已经被删除
|
|
|
QueryWrapper<DisScale> disScaleQueryWrapper = new QueryWrapper<>();
|
|
|
disScaleQueryWrapper.eq("id",delDisScaleInfoVO.getId())
|
|
|
.eq("is_deleted",IsDeleteEnum.Y.getKey());
|
|
@@ -167,6 +173,7 @@ public class DisScaleFacade extends DisScaleServiceImpl {
|
|
|
throw new CommonException(CommonErrorCode.IS_EXISTS,
|
|
|
"此条关联已删除");
|
|
|
}
|
|
|
+ //如果没有则执行删除
|
|
|
UpdateWrapper<DisScale> disScaleUpdateWrapper = new UpdateWrapper<>();
|
|
|
disScaleUpdateWrapper.eq("id",delDisScaleInfoVO.getId())
|
|
|
.set("is_deleted",IsDeleteEnum.Y.getKey())
|