From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java b/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java
index ae84d26..cd6c3d3 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java
@@ -43,9 +43,16 @@
IMaintainFieldService maintainFieldService;
@Autowired
IMenuMappingService menuMappingService;
- @Autowired
- ITUserRoleService userRoleService;
+
+ /**
+ *
+ * @description: 鍒犻櫎涓�鏉℃潈闄愬瓧娈礽d
+ * @param id 鏉冮檺 瀛楁id
+ * @param field 瀛楁鍚嶇О
+ * @return 鍏蜂綋鏁版嵁
+ *
+ */
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
public Result addRole(@PathVariable String id,@RequestParam String field){
MasterAuthor masterAuthor = masterAuthorService.selectById(id);
@@ -61,7 +68,15 @@
}
}
-
+ /**
+ *
+ * @description: 閫氳繃瀛楁鐗堟湰鑾峰彇瀛楁list
+ * @param id 瀛楁鐗堟湰
+ * @param isGroup 鏄惁涓虹敤鎴风粍
+ * @param type 鐢ㄦ埛绫诲瀷
+ * @return 瀛楁list
+ *
+ */
@RequestMapping(value = "/getFieldByMaintainFieldId/{id}", method = RequestMethod.GET)
public Result getFieldByMaintainFieldId(@PathVariable String id, @RequestParam boolean isGroup, @RequestParam MasterAuthorType type, @RequestParam String characterId, HttpServletRequest request) {
List<SysField> result;
@@ -115,6 +130,7 @@
List<String> checkedFieldStrList = fields.stream().map(masterAuthorDetail -> masterAuthorDetail.getField()).collect(Collectors.toList());
result = result.stream().filter(sysField -> !checkedFieldStrList.contains(sysField.getField())).collect(Collectors.toList());
}
+
resultObj.fluentPut("unchecked", result);
resultObj.fluentPut("checked", fields);
return Result.success(resultObj);
--
Gitblit v1.8.0