From 2387941add6c5dc2b7045dd4c04d026de70260c4 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Fri, 13 Jul 2018 19:19:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AD=97=E5=85=B8=E7=9A=84?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?Integer=E5=AF=B9=E8=B1=A1=E5=88=A4=E6=96=AD=E7=9B=B8=E7=AD=89?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=3D=3D=EF=BC=8C=E7=94=A8equals?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 src/main/java/com/nis/domain/basics/ServiceDictInfo.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
index c07a7aba4..2d2dc7611 100644
--- a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
+++ b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
@@ -218,7 +218,7 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 		Integer count = 0;
 		List<ServiceDictInfo> listTemp = new ArrayList<ServiceDictInfo>();
 		for(ServiceDictInfo serviceDictInfo:list){
-			if(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()!=null&&serviceDictInfo.getParent().getServiceDictId()==parentId){
+			if(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()!=null&&serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
 				listTemp.add(serviceDictInfo);
 			}
 		}
@@ -235,7 +235,7 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 						&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
 					//找出该父类
 					for(ServiceDictInfo se:list){
-						if(se.getServiceDictId()==parentId){
+						if(se.getServiceDictId().equals(parentId)){
 							serviceDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
 							countNo++;
 						}
@@ -261,7 +261,7 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	public static String getPNames(List<ServiceDictInfo> list,Integer pid,String pNames) {
 		String pName="";
 		for (ServiceDictInfo serviceDictInfo : list) {
-			if(pid==serviceDictInfo.getServiceDictId()){
+			if(pid.equals(serviceDictInfo.getServiceDictId())){
 				pid=serviceDictInfo.getParent().getServiceDictId();
 				pName=serviceDictInfo.getItemValue();
 				pNames="/"+pName+pNames;