Merge remote-tracking branch 'origin/develop' into develop

src/dsb/com/cnd3b/restcontroller/enterprise/tagents/tagents.java

@@ -325,8 +325,8 @@ public class tagents extends Controller {
         String ftype = content.getString("ftype");
         String frownum = content.getString("frownum");
 
-        PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("texcellentagents", " ftype = '" + ftype + "' AND frownum = '" + frownum + "'");
-        if (paoSetRemote.isEmpty()) {
+        PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("texcellentagents");
+
             PaoRemote paoRemote = paoSetRemote.addAtEnd();
             paoRemote.setValue("texcellentagentsid", paoRemote.getUniqueIDValue(), 11L);
             paoRemote.setValue("fname", fname);
@@ -335,12 +335,8 @@ public class tagents extends Controller {
             paoRemote.setValue("siteid", siteid);
             paoSetRemote.save();
             return getSucReturnObject().toString();
-        } else {
 
 
-            return getErrReturnObject().setErrMsg("当前类型的排序已存在，无法添加").toString();
-        }
-
     }
 
     /**