Merge branch 'master' of http://code.nyzhwlw.com:3000/com_yunfei_saas/agmp_fms

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsWarnServiceImpl.java

@@ -6,6 +6,7 @@ import com.yunfeiyun.agmp.common.enums.WarnStatus;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsTask;
 import com.yunfeiyun.agmp.fms.domain.FmsWarn;
 import com.yunfeiyun.agmp.fms.domain.dto.FmsWarnBySchedulerDto;
@@ -216,7 +217,9 @@ public class FmsWarnServiceImpl implements IFmsWarnService
     @Override
     public int insertFmsWarnBatch(List<FmsWarn> fmsWarn) {
         for (FmsWarn f : fmsWarn){
-            f.setTid(SecurityUtils.getTid());
+            if(StringUtils.isEmpty(f.getTid())){
+                f.setTid(SecurityUtils.getTid());
+            }
         }
         return fmsWarnMapper.insertFmsWarnBatch(fmsWarn);
     }