通讯录

common/src/main/resources/mapper/base/Organization.xml

@@ -119,7 +119,7 @@
 				and a.name_ LIKE #{searchParams.name}
 			</if>
 			<if test="searchParams.noName != null">
-				and name_ not like #{searchParams.noName}
+				and a.name_ not like #{searchParams.noName}
 			</if>
 			<if test="searchParams.parentId != null">
 				and a.parent_id = #{searchParams.parentId}

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

@@ -42,32 +42,32 @@ public class AddressBookApi {
     @Autowired
     private DataDictionaryService dataDictionaryService;
 
+//    @ApiOperation(value="通讯录")
+//    @RequestMapping(value = "bookList",method = RequestMethod.POST)
+//    public MessageResult<Map> bookList(
+//            String orgId,
+//            @RequestAttribute String subject){
+//        MessageResult<Map> msgResult = new MessageResult<>();
+//        Map<String, Object> map = new HashMap<>();
+//
+//        try {
+//            List<RegUser> regUserList = regUserService.findByOrgId(orgId);
+//            map.put("userList",regUserList);
+//            msgResult.setData(map);
+//        }
+//        catch(Exception ex){
+//            logger.error(ex.getMessage(),ex);
+//
+//            msgResult.setResult(false);
+//            msgResult.setMessage(ex.getMessage());
+//        }
+//
+//        return msgResult;
+//    }
+
     @ApiOperation(value="通讯录")
     @RequestMapping(value = "bookList",method = RequestMethod.POST)
-    public MessageResult<Map> bookList(
-            String orgId,
-            @RequestAttribute String subject){
-        MessageResult<Map> msgResult = new MessageResult<>();
-        Map<String, Object> map = new HashMap<>();
-
-        try {
-            List<RegUser> regUserList = regUserService.findByOrgId(orgId);
-            map.put("userList",regUserList);
-            msgResult.setData(map);
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
-
-            msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
-        }
-
-        return msgResult;
-    }
-
-    @ApiOperation(value="选择列表")
-    @RequestMapping(value = "companyList",method = RequestMethod.POST)
-    public MessageResult companyList(String parentId){
+    public MessageResult bookList(String parentId){
         MessageResult msgResult = new MessageResult<>();
 
         Map<String,Object> searchParms = new HashMap<>();
@@ -87,9 +87,11 @@ public class AddressBookApi {
         for(Organization organization : page.getResult()){
             List<Map> children = children(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);
             if(children.size() > 0){
                 org.put("children",children);
             }
@@ -108,10 +110,11 @@ public class AddressBookApi {
         List<Organization> orgList = organizationService.findByParent(orgId);
         for(Organization org : orgList){
             List<Map> children = children(org.getId());
-
+            List<RegUser> regUserList = regUserService.findByOrg(org.getId());
             Map<String,Object> oMap = new HashMap<>();
             oMap.put("label",org.getName());
             oMap.put("value",org.getId());
+            oMap.put("userList",regUserList);
             if(children.size() > 0){
                 oMap.put("children",children);
             }