lyh
2025-07-01 f6a84c246d587f924c2eda088070b455dec52df1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/controller/BaseFactoryUserController.java
@@ -68,9 +68,9 @@
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
       Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
       Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
       String BaseFactoryId = req.getParameter("BaseFactoryId");
       String baseFactoryId = req.getParameter("factoryId");
       String username=req.getParameter("username");
       IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, BaseFactoryId,username);
       IPage<SysUser> pageList = sysUserService.getUserByworkShopDepartId(page, baseFactoryId,username);
       result.setSuccess(true);
       result.setResult(pageList);
       return result;
@@ -127,9 +127,9 @@
   @ApiOperation(value="设备车间管理与用户-通过id删除", notes="设备车间管理与用户-通过id删除")
   //@RequiresPermissions("org.jeecg.modules.mdc:sys_work_shop_depart_user:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(String id, String BaseFactoryId) {
   public Result<String> delete(String id, String factoryId) {
      QueryWrapper<BaseFactoryUser> queryWrapper = new QueryWrapper<BaseFactoryUser>();
      queryWrapper.eq("work_shop_depart_id", BaseFactoryId)
      queryWrapper.eq("factory_id", factoryId)
            .eq("user_id", id);
      BaseFactoryUserService.remove(queryWrapper);
      return Result.OK("删除成功!");
@@ -145,9 +145,9 @@
   @ApiOperation(value="设备车间管理与用户-批量删除", notes="设备车间管理与用户-批量删除")
   //@RequiresPermissions("org.jeecg.modules.mdc:sys_work_shop_depart_user:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(String ids,String BaseFactoryId) {
   public Result<String> deleteBatch(String ids,String factoryId) {
      QueryWrapper<BaseFactoryUser> queryWrapper = new QueryWrapper<BaseFactoryUser>();
      queryWrapper.eq("work_shop_depart_id", BaseFactoryId)
      queryWrapper.eq("factory_id", factoryId)
            .in("user_id", Arrays.asList(ids.split(",")));
      BaseFactoryUserService.remove(queryWrapper);
      return Result.OK("批量删除成功!");