流程撤回修改

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java

@@ -53,7 +53,9 @@ public class ProjectApprovalHandle extends AbstractProcessBusinessHandle {
             IN_THE_ANNUAL_PLAN,
             BE_SUSPENDED,
             SCHEME_UNDER_REVIEW,
-            SCHEME_REVIEW_FAILED
+            SCHEME_REVIEW_FAILED,
+            TO_BE_DECLARED,
+            PLAN_TO_BE_DECLARED
     );
 
     public ProjectApprovalHandle(AnnualPlanLibManage annualPlanLibManage, INdProjectStatusChangeService projectStatusChangeService, IProjectService projectService){

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -468,7 +468,9 @@ public class TodoCenterManage {
         workNoticeInfo.setAccountId(accountId);
         // 根据浙政钉用户ID获取部门code
         DingEmployeeInfo employeeInfo = dingEmployeeInfoService.getOne(Wrappers.lambdaQuery(DingEmployeeInfo.class)
-                .eq(DingEmployeeInfo::getAccountId, accountId).last("limit 1"));
+                .eq(DingEmployeeInfo::getAccountId, accountId)
+                .eq(DingEmployeeInfo::getMainJob,String.valueOf(Boolean.TRUE))
+                .last("limit 1"));
         String organizationCode = employeeInfo.getOrganizationCode();
         workNoticeInfo.setOrganizationCode(organizationCode);
         // 根据部门code获取部门名称

pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java

@@ -49,7 +49,9 @@ public class UserInfoServiceImpl extends ServiceImpl<NdUserInfoMapper, UserInfo>
             }
             // 根据浙政钉用户ID获取单位code
             DingEmployeeInfo employeeInfo = dingEmployeeInfoService.getOne(Wrappers.lambdaQuery(DingEmployeeInfo.class)
-                    .eq(DingEmployeeInfo::getAccountId, accountId).last("limit 1"));
+                    .eq(DingEmployeeInfo::getAccountId, accountId)
+                    .eq(DingEmployeeInfo::getMainJob,String.valueOf(Boolean.TRUE))
+                    .last("limit 1"));
             String organizationCode = employeeInfo.getOrganizationCode();
             // 根据 单位code获取单位名称
             DingOrganization dingOrganization = dingOrganizationService.getOne(Wrappers.lambdaQuery(DingOrganization.class)