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

src/custom/restcontroller/webmanage/optiontype/custom/customoptiontype.java

@@ -131,14 +131,15 @@ public class customoptiontype extends Controller {
     public String delete_optiontypemx() throws YosException {
         long optiontypemxid = content.getLong("optiontypemxid");
 
-       Rows rows=dbConnect.runSqlQuery("SELECT VALUE FROM sys_optiontype t1 INNER JOIN sys_optiontypemx t2 ON t2.optiontypeid=t1.optiontypeid WHERE optiontypemxid=1 AND t2.issystem=0 and t1.typename='tradefield'");
-       if(rows.isNotEmpty()){
-           String VALUE=rows.get(0).getString("VALUE");
-           Rows enRows=dbConnect.runSqlQuery("SELECT t2.enterprisename from sys_enterprise_tradefield t1 \n" +
-                   "INNER JOIN sys_enterprise t2 ON t2.sys_enterpriseid=t1.sys_enterpriseid \n" +
-                   "WHERE t1.tradefield='"+VALUE+"' and t1.siteid='"+siteid+"'");
-           return getErrReturnObject().setErrMsg("【"+StringUtils.join(enRows.toArray("enterprisename"),",")+"】经销商已授权，请先取消授权后删除！").toString();
-       }
+        Rows rows = dbConnect.runSqlQuery("SELECT VALUE FROM sys_optiontype t1 INNER JOIN sys_optiontypemx t2 ON t2.optiontypeid=t1.optiontypeid " +
+                "WHERE optiontypemxid='" + optiontypemxid + "' AND t2.issystem=0 and t1.typename='tradefield'");
+        if (rows.isNotEmpty()) {
+            String VALUE = rows.get(0).getString("VALUE");
+            Rows enRows = dbConnect.runSqlQuery("SELECT t2.enterprisename from sys_enterprise_tradefield t1 \n" +
+                    "INNER JOIN sys_enterprise t2 ON t2.sys_enterpriseid=t1.sys_enterpriseid \n" +
+                    "WHERE t1.tradefield='" + VALUE + "' and t1.siteid='" + siteid + "'");
+            return getErrReturnObject().setErrMsg("【" + StringUtils.join(enRows.toArray("enterprisename"), ",") + "】经销商已授权，请先取消授权后删除！").toString();
+        }
 
         ArrayList<String> list = new ArrayList<>();
         list.add("delete from sys_optiontypemx where issystem=0 and siteid='" + siteid + "' and optiontypemxid=" + optiontypemxid);