Merge remote-tracking branch 'origin/feature/bssb_screen' into feature/bssb_screen

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit db4782f7593219f93de4555b09bfc59a86b7d36f
+Subproject commit 0684de84eb7aeec1f3d6b9cbd53b7fd104f27242

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit 8cd538d06bde3502713af17ba3b645eb944180ec
+Subproject commit 7a119df0841805e0a139b7416a2ee314ca371320

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -768,7 +768,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 处理详情获取存在多条1065的作物数据情况
         Long handlerDeptId;
-        if (0L == resultDTO.getHandlerDeptId() || null == resultDTO.getHandlerDeptId()) {
+        if (null == resultDTO.getHandlerDeptId() || 0L == resultDTO.getHandlerDeptId()) {
             ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
             handlerDeptId = byItemId.getHandlerDeptId();
         } else {
@@ -963,7 +963,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 处理详情获取存在多条1065的作物数据情况
         Long handlerDeptId;
-        if (0L == resultDTO.getHandlerDeptId() || null == resultDTO.getHandlerDeptId()) {
+        if (null == resultDTO.getHandlerDeptId() || 0L == resultDTO.getHandlerDeptId()) {
             ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
             handlerDeptId = byItemId.getHandlerDeptId();
         } else {