try show adv history

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1878,15 +1878,14 @@ public class WmSupervisionManager {
             List<WmTaskSupervisionAdvice> advices =
                 taskSupervisionAdviceService.list(
                     Wrappers.<WmTaskSupervisionAdvice>lambdaQuery()
-                        .eq(WmTaskSupervisionAdvice::getDelFlag, false)
                         .eq(
                             WmTaskSupervisionAdvice::getTaskSupervisionId,
                             wmTaskSupervision.getSupervisionId())
                         );
             
-            String lastUser = null;
+            WmTaskSupervisionAdvice lastAdv = null;
             for(WmTaskSupervisionAdvice adv: advices) {
-                if (adv.getUpdateBy().equals(lastUser)) {
+                if (lastAdv != null && adv.getUpdateBy().equals(lastAdv.getUpdateBy()) && adv.getDelFlag().equals(lastAdv.getDelFlag())) {
                     continue;
                 }
                 SysUser u = userMap.get(adv.getCreateBy());
@@ -1905,9 +1904,9 @@ public class WmSupervisionManager {
                     StrUtil.isBlank(adv.getRemarks()) ? " " : adv.getRemarks();
 
                 advMsg.add(String.format(
-                    "%s【%s】，审核【%s】，监督意见为【%s】(%s)。",
-                    roleName, realName, resultMsg, remarks, date));
-                lastUser = adv.getUpdateBy();
+                    "%s%s【%s】，审核【%s】，监督意见为【%s】(%s)。",
+                    adv.getDelFlag() ? "[历史] " : "", roleName, realName, resultMsg, remarks, date));
+                lastAdv = adv;
             }
           }