bug

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

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

@@ -19,6 +19,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.WbsTreeContractClient;
@@ -119,7 +120,7 @@ public class ConstructionLedgerController extends BladeController {
         }
 
         List<QueryProcessDataVO> queryDataResult;
-        if (!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())) {
+        if (!new Integer("6").equals(node.getNodeType()) && ObjectUtil.isNotEmpty(node.getMajorDataType())  && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())) {
             //非填报节点
             queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), 1, vo.getContractId().toString());
         } else {

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

@@ -3796,6 +3796,7 @@ public class InformationWriteQueryController extends BladeController {
             obj.setStatus(1);
             obj.setIsDeleted(0);
             obj.setIsCustom(1);
+            obj.setMajorDataType(0);
 
             if (ObjectUtil.isNotEmpty(SecureUtil.getUser())) {
                 obj.setCreateUser(SecureUtil.getUserId());

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

@@ -19,6 +19,7 @@ import org.springblade.business.vo.QueryProcessDataVO;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.feign.ContractClient;
@@ -84,9 +85,9 @@ public class NeiYeController {
                 node = this.wbsTreeContractClient.getContractWbsTreeByContractIdAndId(Long.parseLong(queryVO.getWbsIds().get(0)), Long.parseLong(contractId));
             }
             //不是工序，则查询当前节点下的所有填报节点
-            List<QueryProcessDataVO> queryDataResult = new ArrayList<>();
+            List<QueryProcessDataVO> queryDataResult;
             //有些填报节点的MajorDataType为0
-            if (!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())
+            if (!new Integer("6").equals(node.getNodeType()) && ObjectUtil.isNotEmpty(node.getMajorDataType()) &&!Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())
                     && !node.getNodeName().contains("开工报告") && !node.getNodeName().contains("质量检验评定表")) {
                 //非填报节点
                 if (node.getParentId() == 0) {
@@ -105,7 +106,7 @@ public class NeiYeController {
                 //判断是否关联工程部位
                 String sql = "select quality_node_id from u_trial_self_quality_project";
                 List<String> stringList = jdbcTemplate.queryForList(sql, String.class);
-                if (stringList != null && stringList.size() > 0) {
+                if (stringList.size() > 0) {
                     queryDataResult.stream().forEach(qdr -> {
                         if (stringList.contains(qdr.getPrimaryKeyId())) {
                             qdr.setIsExperiment("true");