Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java

@@ -134,7 +134,7 @@
            //查询派遣单位的信息,设置行政区
            dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
         }
         arg.test01(arg.url+"/dispatcher/save",dispatcher);
         //arg.test01(arg.url+"/dispatcher/save",dispatcher);
      }
      else {
         if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
@@ -151,7 +151,7 @@
            //查询派遣单位的信息,设置行政区
            dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
         }
         arg.test01(arg.url+"/dispatcher/update",dispatcher);
         //arg.test01(arg.url+"/dispatcher/update",dispatcher);
      }
      return R.status(dispatcherService.saveOrUpdate(dispatcher));
   }
@@ -164,6 +164,8 @@
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      //内网删除
      //arg.sendPostRemoveByIds(arg.url+"/dispatcher/remove",ids);
      return R.status(dispatcherService.removeByIds(Func.toLongList(ids)));
   }