mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
分堆打包-空包裹数据无法封包,新增分配用户接口
This commit is contained in:
+1
@@ -340,6 +340,7 @@ public class ErrorCodeConstants {
|
||||
public static final ErrorCode PLAN_SORT_DATA_ERROR = new ErrorCode(1_002_041_048, "已无可进行排序的数据,无法进行排序");
|
||||
public static final ErrorCode THIS_PLATE_IS_OPTIMIZE = new ErrorCode(1_002_041_049, "小板:{},已开料,无法删除,请重新选择小板再删除");
|
||||
public static final ErrorCode PLAN_INSERT_PLATE_ERROR = new ErrorCode(1_002_041_050, "当前排单无法新增自增小板,请删除排单重新创建");
|
||||
public static final ErrorCode PART_PACK_DATA_ERROR = new ErrorCode(1_002_041_051, "当前包裹数据为空,无法进行操作,请删除包裹");
|
||||
|
||||
|
||||
|
||||
|
||||
+22
@@ -42,6 +42,7 @@ import javax.annotation.Resource;
|
||||
import javax.annotation.security.PermitAll;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
@@ -134,6 +135,27 @@ public class UserController {
|
||||
pageResult.getTotal()));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/divide-user")
|
||||
@Operation(summary = "角色管理-分配用户")
|
||||
@Parameter(name = "organId", description = "组织ID", required = true)
|
||||
public CommonResult<List<UserRespVO>> getDivideUser(@Valid @RequestParam("organId") @NotNull(message = "组织ID不能为空") Long organId) {
|
||||
|
||||
UserPageReqVO pageReqVO = new UserPageReqVO();
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
pageReqVO.setOrganId(organId);
|
||||
PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO);
|
||||
List<AdminUserDO> list = pageResult.getList();
|
||||
|
||||
if (CollUtil.isEmpty(list)) {
|
||||
return success(new ArrayList<>());
|
||||
}
|
||||
return success(BeanUtils.toBean(list, UserRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@GetMapping({"/list-all-simple", "/simple-list"})
|
||||
@Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户,主要用于前端的下拉选项")
|
||||
public CommonResult<List<UserSimpleRespVO>> getSimpleUserList( @RequestParam(value = "organId", required = false) Long organId,
|
||||
|
||||
Reference in New Issue
Block a user