收费明细确认人员调整

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -441,7 +441,11 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         List<TbFeeDetails> detailsList = this.listByIds(ids);
         Set<String> days = new HashSet<>();
         for (TbFeeDetails detail : detailsList) {
-            detail.setJiChaPerson(admin.getName());
+            String name = admin.getName();
+            if(StrUtil.isNotEmpty(admin.getNickname())){
+                name = admin.getNickname();
+            }
+            detail.setJiChaPerson(name);
             String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
             days.add(dayStr);
         }
@@ -458,8 +462,11 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         List<TbFeeDetails> detailsList = this.listByIds(ids);
         Set<String> days = new HashSet<>();
         for (TbFeeDetails detail : detailsList) {
-
-            detail.setKaiDanPerson(admin.getName());
+            String name = admin.getName();
+            if(StrUtil.isNotEmpty(admin.getNickname())){
+                name = admin.getNickname();
+            }
+            detail.setKaiDanPerson(name);
             String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
             days.add(dayStr);
         }
@@ -476,7 +483,11 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         List<TbFeeDetails> detailsList = this.listByIds(ids);
         Set<String> days = new HashSet<>();
         for (TbFeeDetails detail : detailsList) {
-            detail.setDiaoDuPerson(admin.getName());
+            String name = admin.getName();
+            if(StrUtil.isNotEmpty(admin.getNickname())){
+                name = admin.getNickname();
+            }
+            detail.setDiaoDuPerson(name);
             String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
             days.add(dayStr);
         }