合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage 查看合并请求 laws-nio/laws-weilai!48
This commit is contained in:
+5
-4
@@ -152,10 +152,11 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
|
||||
*/
|
||||
@AutoLog(value = "项目库-法规清单表-批量删除")
|
||||
@ApiOperation(value="项目库-法规清单表-批量删除", notes="项目库-法规清单表-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids,
|
||||
@RequestParam(name="projectLibraryId",required=true) String projectLibraryId,
|
||||
@RequestParam(name="cut",required=true) String cut) {
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestBody JSONObject json) {
|
||||
String ids = json.getString("ids");
|
||||
String projectLibraryId = json.getString("projectLibraryId");
|
||||
String cut = json.getString("cut");
|
||||
this.projectLawsInventoryEOService.deleteByIds(Arrays.asList(ids.split(",")),projectLibraryId,cut);
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -1241,7 +1241,7 @@
|
||||
content: _this.$t('ConfirmBatchDeletion'),
|
||||
onOk() {
|
||||
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
|
||||
deleteAction(_this.url.deleteBatch, {
|
||||
postAction(_this.url.deleteBatch, {
|
||||
ids: idList.join(','),
|
||||
projectLibraryId: _this.$route.query.id
|
||||
}).then((res) => {
|
||||
|
||||
Reference in New Issue
Block a user