From 341786b2a0e0cb50b81aa15fe44929e94332f6db Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Wed, 12 Feb 2025 17:54:55 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yg/df/controller/BsSgcDfJfglController.java | 8 ++++++-- .../com/kms/yg/sz/controller/BsSgcSzFxwzController.java | 6 +++++- .../main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java index 3d0be087..02cf9c39 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java @@ -2,7 +2,9 @@ package com.kms.yg.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfDagl; import com.kms.yg.df.domain.BsSgcDfJfgl; +import com.kms.yg.df.mapper.BsSgcDfDaglMapper; import com.kms.yg.df.service.BsSgcDfJfglService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; @@ -33,6 +35,8 @@ public class BsSgcDfJfglController extends BaseController @Autowired private BsSgcDfJfglService bsSgcDfJfglService; + @Autowired + private BsSgcDfDaglMapper bsSgcDfDaglMapper; @GetMapping("/listByCode/{code}") @@ -104,8 +108,8 @@ public class BsSgcDfJfglController extends BaseController @ApiOperation("经费管理删除") @Log(title = "经费管理删除", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) + public AjaxResult remove(@PathVariable String ids) { - return toAjax(bsSgcDfJfglService.removeByIds(Arrays.asList(ids))); + return AjaxResult.success(bsSgcDfDaglMapper.deleteById(ids)); } } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java index ac25c0e6..351a6213 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java @@ -1,6 +1,7 @@ package com.kms.yg.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; @@ -14,6 +15,7 @@ import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,7 +62,9 @@ public class BsSgcSzFxwzController extends BaseController BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode),false); - record.setWagaName(one.getWagaName()); + if (ObjectUtils.isNotEmpty(one)) { + record.setWagaName(one.getWagaName()); + } } bsSgcSzFxwzIPage.setRecords(records); diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml index 01214d3e..8fe175fc 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml @@ -41,7 +41,7 @@ and sf.id=#{id} - and sj.waga_code=#{wagaCode} + and sj.waga_code like concat('%',#{wagaCode},'%') and sj.EXPR_DATE is null