1
0

2 Revīzijas a88a0841d8 ... dce909a5aa

Autors SHA1 Ziņojums Datums
  eganwu dce909a5aa Merge remote-tracking branch 'origin/develop-yellow' into develop2 11 mēneši atpakaļ
  eganwu 0454ecf412 通告板块删除逻辑调整 11 mēneši atpakaļ

+ 6 - 6
src/custom/restcontroller/webmanage/saletool/notice/noticeclass.java

@@ -118,13 +118,13 @@ public class noticeclass extends Controller {
             if (rowscount.isEmpty()) {
                 return getErrReturnObject().setErrMsg("通告板块不存在,无法删除").toString();
             }
-            if (rowscount.get(0).getBoolean("issystem")) {
-                return getErrReturnObject().setErrMsg("该通告板块为系统板块,无法删除").toString();
-            }
+//            if (rowscount.get(0).getBoolean("issystem")) {
+//                return getErrReturnObject().setErrMsg("该通告板块为系统板块,无法删除").toString();
+//            }
             Rows rowssite = dbConnect.runSqlQuery("select sat_notice_classid from sat_notice_class where issystem=1 and siteid='" + rowscount.get(0).getString("siteid") + "'");
-            if (rowssite.isEmpty() && !dbConnect.runSqlQuery("select sat_noticeid from sat_notice where sat_notice_classid=" + sat_notice_classid).isEmpty()) {
-                return getErrReturnObject().setErrMsg("该通告板块所属站点不存在系统板块无法删除").toString();
-            }
+//            if (rowssite.isEmpty() && !dbConnect.runSqlQuery("select sat_noticeid from sat_notice where sat_notice_classid=" + sat_notice_classid).isEmpty()) {
+//                return getErrReturnObject().setErrMsg("该通告板块所属站点不存在系统板块无法删除").toString();
+//            }
             if (dbConnect.runSqlQuery("select 1 from sat_notice where sat_notice_classid=" + sat_notice_classid).isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("当前分类已存在通告,不可删除").toString();
             }