【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -17,6 +17,7 @@ import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
 import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
 import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
 import com.csbr.cloud.workflow.util.FlowAbstractImpl;
 import com.csbr.cloud.workflow.util.FlowAbstractImpl;
 import com.csbr.qingcloud.portal.domain.vo.*;
 import com.csbr.qingcloud.portal.domain.vo.*;
+import com.csbr.qingcloud.portal.feign.ConfigureFeign;
 import com.csbr.qingcloud.portal.feign.PersonelFeign;
 import com.csbr.qingcloud.portal.feign.PersonelFeign;
 import com.csbr.qingcloud.portal.feign.UserFeign;
 import com.csbr.qingcloud.portal.feign.UserFeign;
 import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
 import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
@@ -81,6 +82,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
     @Resource
     @Resource
     private UserFeign userFeign;
     private UserFeign userFeign;
 
 
+    @Resource
+    private ConfigureFeign configureFeign;
+
     /**
     /**
      * 企业信息分页查询
      * 企业信息分页查询
      * @author xcq
      * @author xcq
@@ -140,6 +144,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         }
         }
         List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
         List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
         try {
         try {
+            if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
+                ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
+            }
             return ChangeInfoUtil.getChangeList(beanList);
             return ChangeInfoUtil.getChangeList(beanList);
         } catch (IllegalAccessException e) {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
             e.printStackTrace();

@@ -23,9 +23,6 @@ import java.util.stream.Collectors;
 @Component
 @Component
 public class ChangeInfoUtil {
 public class ChangeInfoUtil {
 
 
-    @Resource
-    private static ConfigureFeign configureFeign;
-
     public static List<BoroughPOJO> areaList;
     public static List<BoroughPOJO> areaList;
 
 
     /** 计算变更信息 */
     /** 计算变更信息 */
@@ -125,9 +122,6 @@ public class ChangeInfoUtil {
     }
     }
 
 
     private static String getName(String code){
     private static String getName(String code){
-        if(CollectionUtils.isEmpty(areaList)){
-            areaList = configureFeign.getBoroughCodeName().getData();
-        }
         List<String> names = areaList.stream().filter(x->x.getCode().equals(code)).map(BoroughPOJO::getName).collect(Collectors.toList());
         List<String> names = areaList.stream().filter(x->x.getCode().equals(code)).map(BoroughPOJO::getName).collect(Collectors.toList());
         if(CollectionUtils.isEmpty(names)){
         if(CollectionUtils.isEmpty(names)){
             return "";
             return "";