Merge branch 'master' into 'test'

Master

See merge request !45

src/main/java/com/tiptimes/ctrl/ProjectCtrl.java

@@ -2445,18 +2445,25 @@ public class ProjectCtrl {
             if (pojectTeamMember_list == null) {
                 values[i][10] = "";
             } else {
+//                String memberNumber_str = "";
+//                Member member;
+//                for(Iterator var28 = pojectTeamMember_list.iterator(); var28.hasNext(); memberNumber_str = memberNumber_str + member.getMemberName()) {
+//                    ProjectTeamMember pojectTeamMember_list_i = (ProjectTeamMember)var28.next();
+//                    if (!"".equals(memberNumber_str)) {
+//                        memberNumber_str = memberNumber_str + ",";
+//                    }
+//                    member = this.memberService.listMemberBymemberID(pojectTeamMember_list_i.getMemberID());
+//                }
+//                values[i][10] = memberNumber_str;
                 String memberNumber_str = "";
-
-                Member member;
-                for(Iterator var28 = pojectTeamMember_list.iterator(); var28.hasNext(); memberNumber_str = memberNumber_str + member.getMemberName()) {
-                    ProjectTeamMember pojectTeamMember_list_i = (ProjectTeamMember)var28.next();
-                    if (!"".equals(memberNumber_str)) {
+                for (ProjectTeamMember pojectTeamMember_list_i : pojectTeamMember_list) {
+                    if (!"".equals(memberNumber_str))
                         memberNumber_str = memberNumber_str + ",";
+                    Member member = this.memberService.listMemberBymemberID(pojectTeamMember_list_i.getMemberID());
+                    if(member != null){
+                        memberNumber_str = memberNumber_str + member.getMemberName();
                     }
-
-                    member = this.memberService.listMemberBymemberID(pojectTeamMember_list_i.getMemberID());
                 }
-
                 values[i][10] = memberNumber_str;
             }