Pārlūkot izejas kodu

校对负责人防空值判定

user5 2 gadi atpakaļ
vecāks
revīzija
98f002ef51

+ 10 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -1044,7 +1044,11 @@ public class ProjectListService {
         //签发人
         //签发人
         if(null != issuedById){
         if(null != issuedById){
             //校对负责人
             //校对负责人
-            data.put("signer","");
+            if(StringUtils.isNotBlank(issuedById.getAgreeUserId())){
+                data.put("signer",UserUtils.get(issuedById.getAgreeUserId()).getName());
+            }else{
+                data.put("signer","");
+            }
             //校对时间
             //校对时间
             Date issuedAgreeTime=issuedById.getAgreeTime();
             Date issuedAgreeTime=issuedById.getAgreeTime();
             if(null == issuedAgreeTime){
             if(null == issuedAgreeTime){
@@ -1064,6 +1068,11 @@ public class ProjectListService {
         if(null != programArchiveDto){
         if(null != programArchiveDto){
             //校对负责人
             //校对负责人
             data.put("archiveMaster","");
             data.put("archiveMaster","");
+            if(StringUtils.isNotBlank(programArchiveDto.getAuditUserId())){
+                data.put("archiveMaster",UserUtils.get(programArchiveDto.getAuditUserId()).getName());
+            }else{
+                data.put("archiveMaster","");
+            }
             //校对时间
             //校对时间
             Date auditDate=programArchiveDto.getAuditDateDate();
             Date auditDate=programArchiveDto.getAuditDateDate();
             if(null == auditDate){
             if(null == auditDate){