item：【JCS】bug修改提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -805,12 +806,10 @@ public class OrgUsrController extends BaseController {
 				//查询当前登录人所属单位/部门
 				OrgUsr orgUsr = orgUsrMapper.selectById(personIdentity.getCompanyId());
 				//判断登陆人是否已经是顶级节点单位
-					if (orgUsr.getParentId() != null ){
-						orgUsr  =orgUsrService.selectParentOrgUsr(orgUsr);
+				if (!ObjectUtils.isEmpty(orgUsr) && orgUsr.getParentId() != null) {
+					orgUsr = orgUsrService.selectParentOrgUsr(orgUsr);
 					bizOrgCode = orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : personIdentity.getBizOrgCode();
-						
 				}
-
 			}
 		}
 		// 权限处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -305,7 +305,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 					EquipmentSpecificIndex equipmentSpeIndex = new EquipmentSpecificIndex();
 					BeanUtils.copyProperties(equipmentSpecificIndex, equipmentSpeIndex);
 					String value = iotDataVO.getValue().toString();
-					String traceId = iotDataVO.getTraceId().toString();
+					String traceId = iotDataVO.getTraceId();
 					equipmentSpeIndex.setValue(value);
 					equipmentSpeIndex.setTraceId(traceId);
 					equipmentSpeIndex.setValueLabel(valueTranslate(value, equipmentSpecificIndex.getValueEnum()));