From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 03 四月 2025 14:35:02 +0800 Subject: [PATCH] 添加非密字段显示 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java index d9eae5f..a5e422a 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java @@ -87,7 +87,7 @@ @ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ") public R<IPage<AttributeVO>> pageList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) { IPage<AttributeVO> pageVO = new Page<>(); - IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId)); + IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByDesc(Attribute::getCreateTime)); BeanUtil.copy(page,pageVO); pageVO.setRecords( AttributeWrapper.build().listEntityVO(page.getRecords())); return R.data(pageVO); @@ -95,8 +95,8 @@ @GetMapping("/query-page") @ApiImplicitParams({ - @ApiImplicitParam(name = "key",value = "灞炴�у悕妯$硦",paramType = "query",dataType = "string"), - @ApiImplicitParam(name = "notIn",value = "灞炴�у悕鎺掗櫎",paramType = "query",dataType = "string") + @ApiImplicitParam(name = "key",value = "灞炴�х紪鍙锋ā绯�",paramType = "query",dataType = "string"), + @ApiImplicitParam(name = "notIn",value = "灞炴�х紪鍙锋帓闄�",paramType = "query",dataType = "string") }) @ApiOperationSupport(order = 6) @ApiOperation(value = "鏌ヨ鍒楄〃",notes = "浼犲叆鏌ョ殑鍊煎拰涓嶆煡鐨勫��") @@ -118,12 +118,11 @@ return R.data(pageVO); } - - /** - * 鏂板鎴栦慨鏀� - * @param dto 鍏冩暟鎹〉闈紶杈撳璞� - * @return 鎵ц缁撴灉 - */ + /** + * 鏂板鎴栦慨鏀� + * @param dto 鍏冩暟鎹〉闈紶杈撳璞� + * @return 鎵ц缁撴灉 + */ @PostMapping("/submit") @ApiOperationSupport(order = 3) @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�") @@ -134,15 +133,15 @@ /** * 鍒犻櫎 - * @param ids 涓婚敭闆嗗悎 + * @param oid 涓婚敭闆嗗悎 * @return 鎵ц缁撴灉 */ @PostMapping("/remove") @ApiOperationSupport(order = 4) @ApiOperation(value = "鍒犻櫎", notes = "涓婚敭闆嗗悎") - public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) { + public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oid) { CacheUtil.clear(OmdCacheConstant.ATTR_CACHE); - return R.status(attributeService.removeAttrs(ids)); + return attributeService.remove(oid); } /** @@ -156,4 +155,5 @@ public R applyRange(String oid){ return R.data(attributeService.applyRange(oid)); } + } -- Gitblit v1.9.3