Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/org/OrgEndpoint.java

@@ -77,12 +77,12 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop findCommunity(){
        try {
           /* JSONObject param = new JSONObject();
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ListEnvelop.getError("该操作没有权限");
            }*/
            }
            List<Map<String, Object>> community = orgService.findCommunity();
            return success(community);
@@ -96,12 +96,12 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop findCommunityZly(@ApiParam(name = "teamId", value = "teamId")
                                        @RequestParam(value = "teamId", required = true) String teamId){
        try {
            /*JSONObject param = new JSONObject();
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ListEnvelop.getError("该操作没有权限");
            }*/
            }
            List<Map<String, Object>> communityZly = orgService.findCommunityZly(teamId);
            return success(communityZly);