Merge remote-tracking branch 'origin/fencang' into fencang

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -39,7 +39,6 @@ import com.glxp.sale.admin.service.inout.*;
 import com.glxp.sale.admin.service.inventory.InvPreInProductDetailService;
 import com.glxp.sale.admin.service.inventory.InvPreProductDetailService;
 import com.glxp.sale.admin.service.inventory.InvProductDetailService;
-import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.IoTransInoutService;
 import com.glxp.sale.admin.util.*;
@@ -1198,9 +1197,14 @@ public class WareHouseController {
     public BaseResponse saveWarehouseUser(@RequestBody Map<String, Object> params) {
         String code = String.valueOf(params.get("code"));
         String userListJson = String.valueOf(params.get("userList"));
-        if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson))
+        if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
-        warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class));
+        }
+        List<AuthAdmin> userList = JSONUtil.toList(userListJson, AuthAdmin.class);
+        if (CollUtil.isEmpty(userList)) {
+            return ResultVOUtils.error(500, "用户列表不能为空");
+        }
+        warehouseUserService.saveWarehouseUser(code, userList);
         invWarehouseService.updateTime(code, new Date());
         return ResultVOUtils.success();
     }