Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

@@ -795,10 +795,11 @@ public class MeetingManage {
 
     private void buildOptionProjectQuery(LambdaQueryWrapper<Project> query, String meetingType, ProjectStatusEnum status) {
         String sql = String.format("select 1 from meeting m inner join meeting_inner_project mip on" +
-                " m.is_inner_project = true and m.id = mip.meeting_id and m.type = %s and m.status != 3", meetingType);
+                " m.is_inner_project = true and m.id = mip.meeting_id and nd_project.id = mip.project_id" +
+                " and m.type = %s and m.status != 3", meetingType);
         query.eq(Project::getStatus, status.getCode());
-        query.and(q1 -> q1.notExists(sql)).or(q2 -> q2.exists(sql + " inner join nd_expert_review ner " +
-                "on ner.meeting_id = m.id and ner.is_final = true and review_result in (2, 3)"));
+        query.and(q1 -> q1.notExists(sql).or(q2 -> q2.exists(sql + " inner join nd_expert_review ner " +
+                "on ner.meeting_id = m.id and ner.is_final = true and review_result in (2, 3)")));
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -329,6 +329,7 @@ public class UserInfoManage {
         resUserDetailVO.setUserId(userInfo.getId());
         resUserDetailVO.setPhoneNo(userInfo.getMobile());
         resUserDetailVO.setStatus(userInfo.getAvailable());
+        resUserDetailVO.setEmployeeCode(userInfo.getEmployeeCode());
 
         // 装配用户角色信息列表
         List<UserRole> userRoleList = iUserRoleService.list(Wrappers.lambdaQuery(UserRole.class)