Merge remote-tracking branch 'origin/master'

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml

@@ -394,7 +394,7 @@
      src.PART_CODE, src.SUB_CODE, src.SUB_NAME, src.QUOTA,
     src.SUB_TYPE, src.PRODUCT_TYPE, src.AREA, src.CONFIG_NO, src.PLATE,
     src.MATERIAL, src.PLATE_CODE, src.SIN_TER_TYPE
-      FROM TOOL_MES.DS_PART_SUB src where src.PART_CODE = #{partCode}
+      FROM MJMES.DS_PART_SUB src where src.PART_CODE = #{partCode}
     </select>
     <select id="selectListPartByCodeLike" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartEntity">
         SELECT

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -2099,8 +2099,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 						item.setId(null);
 						item.setProcessId(dsProcessEntity.getId());
 						MeasurementRecordsEntity measurementRecords = measurementRecordsService.getById(item.getMtId());
+						if(null != measurementRecords){
 							item.setToolInfo(measurementRecords.getMcName());
 							item.setToolSize(measurementRecords.getNorms());
+						}
 					});
 					if(!CollectionUtils.isEmpty(processMeasuringToolList)){
 						boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList);