Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js
===================================================================
diff -u -r15925 -r15926
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js	(.../goodsAppHelper.js)	(revision 15925)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsAppHelper.js	(.../goodsAppHelper.js)	(revision 15926)
@@ -27,9 +27,8 @@
         checkFn = checkFn || me.checkTousseDefinitionID;
         rootNode.cascadeBy(function (n) {
             if (n.parentNode == rootNode) {
-                var checkNode = checkFn(n, rootNode, node);
-                if (!Ext4.isEmpty(checkNode)) {
-                    foundNode = checkNode;
+                if (checkFn(n, node)) {
+                    foundNode = n;
                     //return false是终止循环遍历,但好像无效,所以这里要多加一个checkNode赋值
                     return false;
                 }
@@ -42,29 +41,23 @@
      * 检验名字和类型
      * @param storeNode store的节点
      * @param needToCheckNode 需要校验的节点
-     * @returns {*}
+     * @returns 如果返回true则表示找到
      */
     goodsAppDomObj.checkNameAndType = function (storeNode, needToCheckNode) {
         var tousseType = needToCheckNode.tousseType;
         var name = needToCheckNode.name;
-        if (storeNode.get('name') == name && storeNode.get('tousseType') == tousseType) {
-            return storeNode;
-        }
-        return null;
+        return storeNode.get('name') == name && storeNode.get('tousseType') == tousseType;
     }
 
     /**
      * 检验tousseDefinitionID
      * @param storeNode store的节点
      * @param needToCheckNode 需要校验的节点
-     * @returns {*}
+     * @returns 如果返回true则表示找到
      */
     goodsAppDomObj.checkTousseDefinitionID = function (storeNode, needToCheckNode) {
         var tousseDefinitionID = needToCheckNode.tousseDefinitionID;
-        if (storeNode.get('tousseDefinitionID') == tousseDefinitionID) {
-            return storeNode;
-        }
-        return null;
+        return storeNode.get('tousseDefinitionID') == tousseDefinitionID;
     }
 
     return new GoodsAppHelperFactory();