chenr il y a 1 mois
Parent
commit
c9d1311eef

+ 2 - 0
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/InformationQueryVO1.java

@@ -2,6 +2,7 @@ package org.springblade.system.user.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
@@ -12,6 +13,7 @@ public class InformationQueryVO1 {
     @TableField("name")
     private String name;
     @TableField("e_visa_pdf_url")
+    @JsonProperty("eVisaPdfUrl")
     private String eVisaPdfUrl;
 
 }

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -2014,8 +2014,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         List <WbsTreeContract>list1=new ArrayList<>();
         getAllChildNodes(fatherNode, list1);
         if(list1.size()>0){
-            int i=0;
             for (WbsTreeContract treeContract : list1) {
+                if(treeContract.getNodeName().indexOf("JS107")>=0){
                     long tabGroupId = SnowFlakeUtil.getId();
                     long newPkId = SnowFlakeUtil.getId();
                     WbsTreeContract wbsTreeContract = new WbsTreeContract();
@@ -2039,8 +2039,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     String querySql = "insert into " + tabName + " (id,p_key_id," + colkeys + ") select '" + newPkId + "','" + newPkId + "'," + colkeys + " from " + tabName + " where p_key_id=" + treeContract.getPKeyId();
                     jdbcTemplate.execute(querySql);
                     wbsTreeContractService.save(wbsTreeContract);
-                    i++;
                     b=true;
+                }
             }
         }
         if(!b){

+ 1 - 1
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -138,7 +138,7 @@ public class WbsTreeController extends BladeController {
         @ApiImplicitParam(name="name",value = "文件名")
     })
     public R<List<InformationQueryVO1>> queryInformationByContractIdAndName(@RequestParam String contractId, @RequestParam(required = false) String name){
-        return R.data(iUserService.queryInformationByContractIdAndName(contractId,name));
+        return R.data(iUserService.queryInformationByContractIdAndName(contractId, name));
     }
 
 //    /**