From c9e097b4010df09622232598c26fea15cc1ee5d0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 08 七月 2022 13:21:53 +0800
Subject: [PATCH] 问题清单bug处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index 3858e8c..ae7ea6d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -238,14 +238,16 @@
                 circleDetailAppVO.setName(actDO.getName());
             }
         }
-        if(circleDetailAppVO.getOrderType()==2){
-            AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
-            circleDetailAppVO.setSolveName(user1.getName());
-        }
-        if(circleDetailAppVO.getOrderType()==1){
-            ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
-            if(comPbCheckUnit!=null){
-                circleDetailAppVO.setSolveName(comPbCheckUnit.getName());
+        if(circleDetailAppVO.getOrderType()!=null){
+            if(circleDetailAppVO.getOrderType()==2){
+                AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
+                circleDetailAppVO.setSolveName(user1.getName());
+            }
+            if(circleDetailAppVO.getOrderType()==1){
+                ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
+                if(comPbCheckUnit!=null){
+                    circleDetailAppVO.setSolveName(comPbCheckUnit.getName());
+                }
             }
         }
 
@@ -723,14 +725,16 @@
         BeanUtils.copyProperties(comActNeighborCircleDO, vo);
         vo.setReleaseName(user.getName());
         vo.setImageUrl(user.getImageUrl());
-        if(comActNeighborCircleDO.getOrderType()==2){
-            AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
-            vo.setSolveName(user1.getName());
-        }
-        if(comActNeighborCircleDO.getOrderType()==1){
-            ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(comActNeighborCircleDO.getSolveUnitId());
-            if(comPbCheckUnit!=null){
-                vo.setSolveName(comPbCheckUnit.getName());
+        if(comActNeighborCircleDO.getOrderType()!=null){
+            if(comActNeighborCircleDO.getOrderType()==2){
+                AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
+                vo.setSolveName(user1.getName());
+            }
+            if(comActNeighborCircleDO.getOrderType()==1){
+                ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(comActNeighborCircleDO.getSolveUnitId());
+                if(comPbCheckUnit!=null){
+                    vo.setSolveName(comPbCheckUnit.getName());
+                }
             }
         }
 

--
Gitblit v1.7.1