回收站删除位置优化，恢复优化

blade-service/blade-business/src/main/java/org/springblade/business/controller/RecycleBinController.java

@@ -230,7 +230,7 @@ public class RecycleBinController extends BladeController {
                     //恢复数据
                     Set<Long> parentIds = new HashSet<>();
                     for (RecycleBinInfo info : recycleBinInfoList) {
-                        String position = info.getPosition();
+                        String position = info.getBusinessId();
                         if (position ==  null) {
                             continue;
                         }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/RecycleBinInfoServiceImpl.java

@@ -189,7 +189,7 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
             info.setCreateUser(AuthUtil.getUserId());
             info.setOperationTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
             info.setDelId(contract.getPKeyId());
-            info.setPosition(contract.getAncestorsPId());
+            info.setBusinessId(contract.getAncestorsPId());
 
             WbsTreeContract delRoot = rootMap.get(contract.getPKeyId());
             if (delRoot != null) {
@@ -343,7 +343,7 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
                     info.setCreateTime(recycleBin.getCreateTime());
                     info.setOperationTime(recycleBin.getOperationTime());
                     info.setDelId(contract.getPKeyId());
-                    info.setPosition(contract.getAncestorsPId());
+                    info.setBusinessId(contract.getAncestorsPId());
                     if (recycleBin.getIsDeleted() == 1) {
                         info.setStatus(1);
                         info.setUpdateUser(recycleBin.getUpdateUser());

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -298,9 +298,9 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
     //去除重复天气，并填充每个合同段缺失的天气
     @Scheduled(cron = "0 0 9 * * ?")
     public void scanMissWeather(){
-        if (!SystemUtils.isLinux()) {
-            return;
-        }
+//        if (!SystemUtils.isLinux()) {
+//            return;
+//        }
         //获取所有项目的合同段
         List<ContractInfoVO> contractInfos = baseMapper.getAllContract();
         for (ContractInfoVO contract : contractInfos) {

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -797,9 +797,9 @@ public class EVisaServiceImpl implements EVisaService {
         if ("20".equals(sys_isonline) || SystemUtils.isWindows() || SystemUtils.isMacOs()) {
             url = "http://219.151.181.73:9125/FrontSys/SealServicezx/FileSignByKeyWord";
         }
-        if(signPdfByDFZX.equals("3")){
-            url = "http://10.0.0.4:9125/FrontSys/SealServicezx/FileSignByKeyWord";
-        }
+//        if(signPdfByDFZX.equals("3")){
+//            url = "http://10.0.0.4:9125/FrontSys/SealServicezx/FileSignByKeyWord";
+//        }
 
 
         String sysLocalFileUrl = FileUtils.getSysLocalFileUrl();