Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/sys/controller/DataDictionaryController.java

@@ -286,6 +286,25 @@ public class DataDictionaryController {
         return msgResult;
     }
 
+    @ApiOperation(value = "查询字典")
+    @RequestMapping(value = "queryChildrenApi", method = RequestMethod.POST)
+    public MessageResult<Map> queryChildrenApi(
+            @RequestParam(value = "parentId", defaultValue = "") String parentId,
+            String token,
+            @RequestAttribute String subject) {
+        MessageResult<Map> msgResult = new MessageResult<>();
+        Map map=new HashMap();
+        List<Map<String, Object>> dataDictionaryList=null;
+        for(String  id : parentId.split(",")){
+            dataDictionaryList = dataDictionaryService.queryChildren(id);
+            map.put(id,dataDictionaryList);
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(map);
+        return msgResult;
+    }
+
     @PostMapping("findByCatalogName")
     @ApiOperation(value = "根据目录名称查询数据列表")
     @ApiImplicitParams({