dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
PQZ 2024-12-10 16:42:39 +08:00
parent 853c5913d8
commit 296eb4f3cb
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
View File

@ -38,7 +38,6 @@ public class PropertyPosController {
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新企业管理-资产存放位置") @Operation(summary = "更新企业管理-资产存放位置")
@PreAuthorize("@ss.hasPermission('company:property-pos:update')")
public CommonResult<Boolean> updatePropertyPos(@RequestBody PropertyPosReqVO updateReqVO) { public CommonResult<Boolean> updatePropertyPos(@RequestBody PropertyPosReqVO updateReqVO) {
propertyPosService.updatePropertyPos(updateReqVO); propertyPosService.updatePropertyPos(updateReqVO);
return success(true); return success(true);
@ -47,7 +46,6 @@ public class PropertyPosController {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除企业管理-资产存放位置") @Operation(summary = "删除企业管理-资产存放位置")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('company:property-pos:delete')")
public CommonResult<Boolean> deletePropertyPos(@RequestParam("id") String id) { public CommonResult<Boolean> deletePropertyPos(@RequestParam("id") String id) {
propertyPosService.deletePropertyPos(id); propertyPosService.deletePropertyPos(id);
return success(true); return success(true);
@ -56,7 +54,6 @@ public class PropertyPosController {
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得企业管理-资产存放位置") @Operation(summary = "获得企业管理-资产存放位置")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('company:property-pos:query')")
public CommonResult<PropertyPosRespVO> getPropertyPos(@RequestParam("id") String id) { public CommonResult<PropertyPosRespVO> getPropertyPos(@RequestParam("id") String id) {
PropertyPos propertyPos = propertyPosService.getPropertyPos(id); PropertyPos propertyPos = propertyPosService.getPropertyPos(id);
return success(BeanUtils.toBean(propertyPos, PropertyPosRespVO.class)); return success(BeanUtils.toBean(propertyPos, PropertyPosRespVO.class));
@ -64,7 +61,6 @@ public class PropertyPosController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得企业管理-资产存放位置分页") @Operation(summary = "获得企业管理-资产存放位置分页")
@PreAuthorize("@ss.hasPermission('company:property-pos:query')")
public CommonResult<IPage<?>> getPropertyPosPage(PropertyPosReqVO pageReqVO, public CommonResult<IPage<?>> getPropertyPosPage(PropertyPosReqVO pageReqVO,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@ -80,7 +76,6 @@ public class PropertyPosController {
**/ **/
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得企业管理-资产存放位置列表") @Operation(summary = "获得企业管理-资产存放位置列表")
@PreAuthorize("@ss.hasPermission('company:property-pos:query')")
public CommonResult<List<?>> getPropertyPosList() { public CommonResult<List<?>> getPropertyPosList() {
return success(propertyPosService.list()); return success(propertyPosService.list());
} }
@ -93,7 +88,6 @@ public class PropertyPosController {
**/ **/
@GetMapping("/listByCorpId") @GetMapping("/listByCorpId")
@Operation(summary = "获得企业管理-资产存放位置列表") @Operation(summary = "获得企业管理-资产存放位置列表")
@PreAuthorize("@ss.hasPermission('company:property-deal:query')")
public CommonResult<List<PropertyPos>> getPositionByCorpId(String id){ public CommonResult<List<PropertyPos>> getPositionByCorpId(String id){
return success(propertyPosService.list(new LambdaQueryWrapper<PropertyPos>().eq(PropertyPos::getCorpId, id))); return success(propertyPosService.list(new LambdaQueryWrapper<PropertyPos>().eq(PropertyPos::getCorpId, id)));
} }

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
View File

@ -117,7 +117,7 @@ public class AuthController {
if (loginBody.getTypes().equals("3") && !roleNames.contains("教练")){ if (loginBody.getTypes().equals("3") && !roleNames.contains("教练")){
return error(new ErrorCode(2_002_000_005, "当前登录用户未分配教练角色")); return error(new ErrorCode(2_002_000_005, "当前登录用户未分配教练角色"));
} }
if (loginBody.getTypes().equals("2") && !roleNames.contains("驾校管理员")){ if (loginBody.getTypes().equals("2") && !roleNames.contains("驾校业务管理员")){
return error(new ErrorCode(2_002_000_005, "当前登录用户未分配驾校管理员角色")); return error(new ErrorCode(2_002_000_005, "当前登录用户未分配驾校管理员角色"));
} }