1

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -261,8 +261,7 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
         if (model.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
             if (unitLevel.equals(1)) {
                 if (auditMethod.equals(CommonEnum.auditMethod.audit.getCode())) {
-                    if (model.getAuditType().equals(CommonEnum.auditType.project.getCode())) {
-                        // 查询上级单位上报记录
+//                    if (model.getAuditType().equals(CommonEnum.auditType.project.getCode())) {
                     ComProjectAudit auditNote = this.getAudit(auditObjectId, auditUnitId, auditType, CommonEnum.auditMethod.last.getCode(), null);
                     if (null != auditNote) {
                         // 更新上级单位上报记录
@@ -274,19 +273,19 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
                     // 插入审核记录表
                     comProjectAuditNoteService.insertAuditNote(reportYear, auditType, auditObjectId, CommonEnum.auditMethod.last.getCode(), auditUnitId, null, CommonEnum.auditResult.waitAudit.getCode(), null, unitLevel, index + 1, SecurityUserHolder.getPersonId());
                     unitId = auditUnitId;
-                    }
+//                    }
                 }
             } else {
                 // 获取上级单位
-                if (model.getAuditType().equals(CommonEnum.auditType.talent.getCode())) {
-                    if ((auditUnitTreeCode.length() / properties.getDefaultCodeLength()) > 3) {
-                        upTreeCode = auditUnitTreeCode.substring(0, 10);
-                    } else {
-                        upTreeCode = auditUnitTreeCode.substring(0, auditUnitTreeCode.length() - properties.getDefaultCodeLength());
-                    }
-                } else {
+//                if (model.getAuditType().equals(CommonEnum.auditType.talent.getCode())) {
+//                    if ((auditUnitTreeCode.length() / properties.getDefaultCodeLength()) > 3) {
+//                        upTreeCode = auditUnitTreeCode.substring(0, 10);
+//                    } else {
+//                        upTreeCode = auditUnitTreeCode.substring(0, auditUnitTreeCode.length() - properties.getDefaultCodeLength());
+//                    }
+//                } else {
                 upTreeCode = auditUnitTreeCode.substring(0, 5);
-                }
+//                }
                 unitLevel = upTreeCode.length() / properties.getDefaultCodeLength();
                 ComUnitDTO unit = comUnitService.getByTreeCode(upTreeCode);
                 if (null == unit)