bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterContractInfo.java

@@ -66,4 +66,13 @@ public class MeterContractInfo extends BaseEntity {
     @ApiModelProperty(value = "农民-预扣农民工资保证金")
     private BigDecimal nmPayDepositWithheld;
 
+    @ApiModelProperty(value = "开户银行")
+    private String bankOfDeposit;
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccountNumber;
+
+    @ApiModelProperty(value = "银行账户名称")
+    private String bankAccountName;
+
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -359,6 +359,10 @@ public class MeterTreeController extends BladeController {
     @ApiOperationSupport(order = 15)
     @ApiOperation(value = "项目树节点新增", notes = "传入MeterTreeProject（上级的id赋值到parentId字段上提交）")
     public R<Object> projectSave(@RequestBody MeterTreeProject obj) {
+        if (ObjectUtil.isEmpty(obj.getNodeName()) || obj.getNodeName().trim().length() == 0) {
+            throw new ServiceException("节点名称不能为空");
+        }
+
         /*计算parentId、ancestor*/
         if (ObjectUtil.isEmpty(obj.getParentId()) || ObjectUtil.isEmpty(obj.getAncestor())) {
             throw new ServiceException("未获取到父节点id或祖级id");

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeContractServiceImpl.java

@@ -1528,6 +1528,7 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
      */
     private List<MeterTreeProject> getMeterTreeProjectNode(Long projectId, Long templateId, Long rootId) {
         return meterTreeProjectMapper.selectList(Wrappers.<MeterTreeProject>lambdaQuery()
+                .isNotNull(MeterTreeProject::getNodeName)
                 .eq(MeterTreeProject::getStatus, 1)
                 .eq(MeterTreeProject::getProjectId, projectId)
                 .eq(MeterTreeProject::getTemplateId, templateId)