通讯录

web/src/main/java/com/jpsoft/railroad/modules/mobile/controller/AddressBookApi.java

@@ -71,11 +71,11 @@ public class AddressBookApi {
         MessageResult msgResult = new MessageResult<>();
 
         Map<String,Object> searchParms = new HashMap<>();
-        if(StringUtils.isNotEmpty(parentId)) {
-            searchParms.put("parentId", parentId);
-        }else{
-            searchParms.put("noParentId", "1");
-        }
+//        if(StringUtils.isNotEmpty(parentId)) {
+//            searchParms.put("parentId", parentId);
+//        }else{
+//            searchParms.put("noParentId", "1");
+//        }
 
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("a.name_","asc"));
@@ -87,11 +87,11 @@ public class AddressBookApi {
         for(Organization organization : page.getResult()){
 //            List<Map> children = children(organization.getId());
 
-            List<RegUser> regUserList = regUserService.findByOrg(organization.getId());
+//            List<RegUser> regUserList = regUserService.findByOrg(organization.getId());
             Map<String,Object> org = new HashMap<>();
             org.put("label",organization.getName());
             org.put("value",organization.getId());
-            org.put("userList",regUserList);
+//            org.put("userList",regUserList);
 //            if(children.size() > 0){
 //                org.put("children",children);
 //            }
@@ -104,6 +104,16 @@ public class AddressBookApi {
         return msgResult;
     }
 
+    @ApiOperation(value="通讯录")
+    @RequestMapping(value = "userList",method = RequestMethod.POST)
+    public MessageResult userList(String orgId){
+        MessageResult msgResult = new MessageResult<>();
+        List<RegUser> regUserList = regUserService.findByOrg(orgId);
+        msgResult.setResult(true);
+        msgResult.setData(regUserList);
+        return msgResult;
+    }
+
     private List<Map> children(String orgId){
         List<Map> list = new ArrayList<>();