判断

src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -166,9 +166,12 @@ public class OrgInfoController {
 			 * 库区代码
 			 * 库区代码	单位代码+3位库区顺序码
 			 */
-			String kqbm = dwdm.concat(orgInfo.getOrgCode());
-			orgInfo.setKqbm(kqbm);
-			orgInfoService.updateSelective(orgInfo);
+			if(null != dwdm){
+				String kqbm = dwdm.concat(orgInfo.getOrgCode());
+				orgInfo.setKqbm(kqbm);
+				orgInfoService.updateSelective(orgInfo);
+			}
+			
 			
 			
 			/*orgInfo.setKqbm(BusinessUtils.setBZkqbm(zzdm, orgInfo.getOrgId()));
@@ -196,9 +199,12 @@ public class OrgInfoController {
         		orgInfo.setWjl(hexString);
         	}
 			
-			String kqbm = dwdm.concat(orgInfo.getOrgCode());
-			orgInfo.setKqbm(kqbm);
-			orgInfoService.updateSelective(orgInfo);
+			if(null != dwdm){
+				String kqbm = dwdm.concat(orgInfo.getOrgCode());
+				orgInfo.setKqbm(kqbm);
+				orgInfoService.updateSelective(orgInfo);
+			}
+			
 			
 //			orgInfo.setKqbm(BusinessUtils.setBZkqbm(orgInfo.getCreditCode(), orgInfo.getOrgId()));
 //			orgInfoService.update(orgInfo);