ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(模块): 删除判断问题

Browse Source
This commit is contained in:
yjz
2023-11-24 14:57:31 +08:00
parent 7913613e44
commit 2a0249153f
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
@ApiOperation(value="企标稽查计划业务表-通过id删除", notes="企标稽查计划业务表-通过id删除") @ApiOperation(value="企标稽查计划业务表-通过id删除", notes="企标稽查计划业务表-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody IdMapBody map) { public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){ if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!"); return Result.error("请选择数据!");
} }
processEsInspectPlanService.deleteById(map.getId()); processEsInspectPlanService.deleteById(map.getId());
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java
+2 -2
View File
@@ -127,7 +127,7 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
@ApiOperation(value="企标稽查计划业务_意见表-通过id删除", notes="企标稽查计划业务_意见表-通过id删除") @ApiOperation(value="企标稽查计划业务_意见表-通过id删除", notes="企标稽查计划业务_意见表-通过id删除")
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody IdMapBody map) { public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){ if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!"); return Result.error("请选择数据!");
} }
processEsInspectPlanOpinionService.deleteById(map.getId()); processEsInspectPlanOpinionService.deleteById(map.getId());
@@ -144,7 +144,7 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
@ApiOperation(value="企标稽查计划业务_意见表-批量删除", notes="企标稽查计划业务_意见表-批量删除") @ApiOperation(value="企标稽查计划业务_意见表-批量删除", notes="企标稽查计划业务_意见表-批量删除")
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody IdsMapBody map) { public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isNotBlank(map.getIds())){ if (StringUtils.isBlank(map.getIds())){
return Result.error("请选择数据!"); return Result.error("请选择数据!");
} }
this.processEsInspectPlanOpinionService.deleteByIds(Arrays.asList(map.getIds().split(","))); this.processEsInspectPlanOpinionService.deleteByIds(Arrays.asList(map.getIds().split(",")));
laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java
+2 -2
View File
@@ -237,7 +237,7 @@ public class LawsCustomCompareInfoController {
@PostMapping(value = "/delById") @PostMapping(value = "/delById")
@RequiresPermissions("customComparison:delete") @RequiresPermissions("customComparison:delete")
public Result<T> delById(@RequestBody IdMapBody map) { public Result<T> delById(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){ if (StringUtils.isBlank(map.getId())){
lawsCustomCompareInfoService.delById(map.getId()); lawsCustomCompareInfoService.delById(map.getId());
lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); lawsCustomCompareInfoService.editCompareCreateTime(map.getId());
} }
@@ -253,7 +253,7 @@ public class LawsCustomCompareInfoController {
@PostMapping(value = "/delInventoryById") @PostMapping(value = "/delInventoryById")
@RequiresPermissions("customComparison:edit") @RequiresPermissions("customComparison:edit")
public Result<T> delInventoryById(@RequestBody IdMapBody map) { public Result<T> delInventoryById(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){ if (StringUtils.isBlank(map.getId())){
lawsCustomCompareInventoryService.removeById(map.getId()); lawsCustomCompareInventoryService.removeById(map.getId());
lawsCustomCompareInfoService.editCompareCreateTime(map.getId()); lawsCustomCompareInfoService.editCompareCreateTime(map.getId());
} }
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+8 -7
View File
@@ -16,6 +16,7 @@ import com.jero.modules.split.entity.SarFileSplitItemsValEO;
import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.entity.SarFileSplitMenuEO;
import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.system.vo.IdMapBody; import com.jero.modules.system.vo.IdMapBody;
import com.jero.modules.system.vo.IdsMapBody;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@@ -190,7 +191,7 @@ public class DocumentSplitController {
@RequiresPermissions("split:sarFileSplitInfo:delete") @RequiresPermissions("split:sarFileSplitInfo:delete")
@ApiOperationSupport(order = 9) @ApiOperationSupport(order = 9)
public Result<T> delete(@RequestBody IdMapBody map) { public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())) { if (StringUtils.isBlank(map.getId())){
String id = map.getId(); String id = map.getId();
documentSplitService.checkOutOperation(Collections.singletonList(id)); documentSplitService.checkOutOperation(Collections.singletonList(id));
sarFileSplitInfoService.deleteById(id); sarFileSplitInfoService.deleteById(id);
@@ -208,13 +209,13 @@ public class DocumentSplitController {
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
@RequiresPermissions("split:sarFileSplitInfo:deleteBatch") @RequiresPermissions("split:sarFileSplitInfo:deleteBatch")
@ApiOperationSupport(order = 10) @ApiOperationSupport(order = 10)
public Result<T> deleteBatch(@RequestBody Map<String, Object> map) { public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (map.containsKey("ids")) { if (StringUtils.isBlank(map.getIds())) {
String ids = (String) map.get("ids"); return Result.error("请选择数据!");
List<String> list = Arrays.asList(ids.split(","));
documentSplitService.checkOutOperation(list);
sarFileSplitInfoService.deleteByIds(list);
} }
List<String> list = Arrays.asList(map.getIds().split(","));
documentSplitService.checkOutOperation(list);
sarFileSplitInfoService.deleteByIds(list);
return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
} }