supervisor's adv content set to null

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

@@ -1869,7 +1869,7 @@ public class WmSupervisionManager {
             
             WmTaskSupervisionAdvice lastAdv = null;
             for(WmTaskSupervisionAdvice adv: advices) {
-                if (lastAdv != null && adv.getUpdateBy().equals(lastAdv.getUpdateBy()) && adv.getDelFlag().equals(lastAdv.getDelFlag())) {
+                if (lastAdv != null && adv.getCreateBy().equals(lastAdv.getCreateBy()) && adv.getDelFlag().equals(lastAdv.getDelFlag())) {
                     continue;
                 }
                 SysUser u = userMap.get(adv.getCreateBy());
@@ -1883,7 +1883,7 @@ public class WmSupervisionManager {
                             : role.getRoleName()));
                 String realName = u.getRealname();
                 String date = formatter.format(adv.getCreateTime());
-                String resultMsg = isSupervisor(SecurityUtils.getRoles())
+                String resultMsg = adv.getTaskSupervisionContent() == null // 临时方案，监督员的监督内容为空
                     ? adv.getAdviceResult() ? " 通过 " : " 不通过 " 
                     : adv.getAdviceResult() ? " 同意 " : " 不同意 ";
                 String remarks =
@@ -1979,7 +1979,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
             supervision.getSupervisionId(), remarks, modifiable, resource.getSupervision(), operator);
         // 监督员advice作为历史保留
         taskSupervisionAdviceService.createAdvice(
-            supervision.getSupervisionId(), resource, remarks, operator);
+            supervision.getSupervisionId(), resource, null, operator);
       }
      
     }
@@ -1993,7 +1993,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
         }
         // 监督员advice作为历史保留
         taskSupervisionAdviceService.createAdvice(
-            sup.getSupervisionId(), resource, sup.getRemarks(), operator);
+            sup.getSupervisionId(), resource, null, operator);
       } catch(DataIntegrityViolationException e) {
         throw new BizException("任务已被监督：" + resource.getTaskId().toString());
       }