Merge branch 'dev-2.12.0' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/entity/BusinessQcQualityInspectionItem.java

@@ -55,5 +55,5 @@ public class BusinessQcQualityInspectionItem implements Serializable {
 
     @ApiModelProperty(value = "检验方法名称")
     @TableField(exist = false)
-    private Integer parentInspectionItemName;
+    private String parentInspectionItemName;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/service/impl/QualityInspectionOrgServiceImpl.java

@@ -17,6 +17,7 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -110,7 +111,8 @@ public class QualityInspectionOrgServiceImpl extends ServiceImpl<QualityInspecti
         QualityInspectionWholeDetail qualityInspection = qualityInspectionOrgMapper.getQualityInspection(qualityId);
         // 查询检验项目及依据
         List<BusinessQcQualityInspectionItem> items = qualityInspectionOrgMapper.getQualityInspectionItem(qualityId);
-        qualityInspection.setItems(items);
+        if (CollectionUtils.isNotEmpty(items))
+            qualityInspection.setItems(items);
         // 返回
         return qualityInspection;
     }