Browse Source

1、审批人列表返回添加nickname

dongpo 6 months ago
parent
commit
b1b200224c
13 changed files with 29 additions and 0 deletions
  1. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/business/OaBusinessServiceImpl.java
  2. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java
  3. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java
  4. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/expense/OaExpenseServiceImpl.java
  5. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java
  6. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/out/OaOutServiceImpl.java
  7. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/purchase/OaPurchaseServiceImpl.java
  8. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/receive/OaReceiveServiceImpl.java
  9. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java
  10. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/stamp/OaStampServiceImpl.java
  11. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java
  12. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java
  13. 5 0
      yudao-module-personnel/yudao-module-employee-api/src/main/java/cn/iocoder/yudao/module/employee/api/dto/EmployeeRespDTO.java

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/business/OaBusinessServiceImpl.java

@@ -654,6 +654,7 @@ public class OaBusinessServiceImpl implements OaBusinessService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -695,6 +696,7 @@ public class OaBusinessServiceImpl implements OaBusinessService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java

@@ -659,6 +659,7 @@ public class OaConversionServiceImpl implements OaConversionService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -700,6 +701,7 @@ public class OaConversionServiceImpl implements OaConversionService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -581,6 +581,7 @@ public class OaEntryServiceImpl implements OaEntryService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -622,6 +623,7 @@ public class OaEntryServiceImpl implements OaEntryService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/expense/OaExpenseServiceImpl.java

@@ -760,6 +760,7 @@ public class OaExpenseServiceImpl implements OaExpenseService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -801,6 +802,7 @@ public class OaExpenseServiceImpl implements OaExpenseService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -651,6 +651,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -692,6 +693,7 @@ public class OaLeaveServiceImpl implements OaLeaveService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/out/OaOutServiceImpl.java

@@ -649,6 +649,7 @@ public class OaOutServiceImpl implements OaOutService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -690,6 +691,7 @@ public class OaOutServiceImpl implements OaOutService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/purchase/OaPurchaseServiceImpl.java

@@ -680,6 +680,7 @@ public class OaPurchaseServiceImpl implements OaPurchaseService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -721,6 +722,7 @@ public class OaPurchaseServiceImpl implements OaPurchaseService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/receive/OaReceiveServiceImpl.java

@@ -682,6 +682,7 @@ public class OaReceiveServiceImpl implements OaReceiveService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -723,6 +724,7 @@ public class OaReceiveServiceImpl implements OaReceiveService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java

@@ -687,6 +687,7 @@ public class OaRenewServiceImpl implements OaRenewService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -728,6 +729,7 @@ public class OaRenewServiceImpl implements OaRenewService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/stamp/OaStampServiceImpl.java

@@ -682,6 +682,7 @@ public class OaStampServiceImpl implements OaStampService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -733,6 +734,7 @@ public class OaStampServiceImpl implements OaStampService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -675,6 +675,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -716,6 +717,7 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java

@@ -567,6 +567,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }
@@ -608,6 +609,7 @@ public class OaUniversalServiceImpl implements OaUniversalService {
             for (Long employeeId : employeeIdList) {
                 EmployeeRespDTO employeeRespDTO = longEmployeeRespDTOMap.get(employeeId);
                 if (employeeRespDTO != null) {
+                    employeeRespDTO.setNickname(employeeRespDTO.getName());
                     auditUserList.add(employeeRespDTO);
                 }
             }

+ 5 - 0
yudao-module-personnel/yudao-module-employee-api/src/main/java/cn/iocoder/yudao/module/employee/api/dto/EmployeeRespDTO.java

@@ -28,6 +28,11 @@ public class EmployeeRespDTO {
      */
     private String name;
 
+    /**
+     * 昵称,冗余字段,前端展示
+     */
+    private String nickname;
+
     /**
      * 员工头像
      */