Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsTaskasset;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskAssetUsageReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsTaskListReqVo;
@@ -45,6 +44,7 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
      */
     @Override
     public List<FmsTaskasset> selectFmsTaskassetList(FmsTaskasset fmsTaskasset) {
+        fmsTaskasset.setTid(SecurityUtils.getTid());
         return fmsTaskassetMapper.selectFmsTaskassetList(fmsTaskasset);
     }
     
@@ -56,6 +56,7 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
      */
     @Override
     public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetUsageResVoList(FmsTaskAssetUsageReqVo fmsTaskAssetUsageReqVo) {
+        fmsTaskAssetUsageReqVo.setTid(SecurityUtils.getTid());
         return fmsTaskassetMapper.selectFmsTaskAssetUsageResVoList(fmsTaskAssetUsageReqVo);
     }
 
@@ -78,6 +79,7 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
 
     @Override
     public List<FmsTaskAssetUsageResVo> selectFmsTaskAssetStat(FmsTaskListReqVo reqVo) {
+        reqVo.setTid(SecurityUtils.getTid());
         return fmsTaskassetMapper.selectFmsTaskAssetStat(reqVo);
     }
 
@@ -89,9 +91,7 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
      */
     @Override
     public int insertFmsTaskasset(FmsTaskasset fmsTaskasset) {
-        if(StringUtils.isEmpty(fmsTaskasset.getTid())){
-            fmsTaskasset.setTid(SecurityUtils.getTid());
-        }
+        fmsTaskasset.setTid(SecurityUtils.getTid());
         return fmsTaskassetMapper.insertFmsTaskasset(fmsTaskasset);
     }
 
@@ -103,6 +103,7 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
      */
     @Override
     public int updateFmsTaskasset(FmsTaskasset fmsTaskasset) {
+        fmsTaskasset.setTid(SecurityUtils.getTid());
         return fmsTaskassetMapper.updateFmsTaskasset(fmsTaskasset);
     }
 
@@ -130,6 +131,7 @@ public class FmsTaskassetServiceImpl implements IFmsTaskassetService
 
     @Override
     public List<FmsTaskassetExcelVo> selectFmsTaskassetExcelVoList(FmsTaskAssetUsageReqVo fmsTaskAssetUsageReqVo) {
+        fmsTaskAssetUsageReqVo.setTid(SecurityUtils.getTid());
         return fmsTaskassetMapper.selectFmsTaskassetExcelVoList(fmsTaskAssetUsageReqVo);
     }
 }