xuxiuxi

2017-04-25 ff00dd40e4d2a886bd4ea041a885eca41ad7149b

git-svn-id: http://192.168.1.226/svn/proxy@552 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java

@@ -128,10 +128,10 @@
        }

        Collections.sort(list, new Comparator<CheckInQueryItem>() {

            @Override

            public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {

            public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {

                if (sortedByDept) {

                    String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();

                    String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();

                    String dept1Name = item1.getDeptName()==null?"":item1.getDeptName();

                    String dept2Name = item2.getDeptName()==null?"":item2.getDeptName();

                    if(!dept1Name.equals(dept2Name)) {

                        String dept1Name_a = dept1Name.trim();

                        String dept1Name_b = dept2Name.trim();

@@ -142,13 +142,13 @@
                        return dept1Name_a.compareTo(dept1Name_b);

                    }

                }

                String name1 = t1.getUsername()==null?"":t1.getUsername();

                String name2 = t2.getUsername()==null?"":t2.getUsername();

                String dept1Name_a = name1.trim();

                String dept1Name_b = name2.trim();

                String username1 = item1.getUsername()==null?"":item1.getUsername();

                String username2 = item2.getUsername()==null?"":item2.getUsername();

                String dept1Name_a = username1.trim();

                String dept1Name_b = username2.trim();

                if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {

                    dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();

                    dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();

                    dept1Name_a = CharacterParser.getInstance().getSelling(username1).toLowerCase();

                    dept1Name_b = CharacterParser.getInstance().getSelling(username2).toLowerCase();

                }

                return dept1Name_a.compareTo(dept1Name_b);

            }