Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue

@@ -255,32 +255,23 @@ export default {
     // 获取数据列表
     async getDatasetList() {
       this.loading = true;
-      let orConditionList = [
-        {
-          fieldCode: this.fieldCode,
-          fieldValue: `%${this.searchVal}%`,
-        },
-        ...this.sortSearch,
-      ];
-
-      let res = await getDatasetList({
+      let obj = {};
+      let orConditionList = [];
+      let form = {
         page: this.current,
         size: this.size,
         appId: this.appId,
-        orConditionList,
-        // fieldCode: this.fieldCode,
-        // fieldValue: `%${this.searchVal}%`,
-        // orConditionList: [
-        //   {
-        //     fieldCode: this.fieldCode,
-        //     fieldValue: `%${this.searchVal}%`,
-        //   },
-        //   {
-        //     fieldCode: "top",
-        //     fieldValue: `%%`,
-        //   },
-        // ],
-      });
+      };
+      if (this.fieldCode) {
+        obj.fieldCode = this.fieldCode;
+        obj.fieldValue = `%${this.searchVal}%`;
+        orConditionList.push(obj);
+      }
+      orConditionList = [...orConditionList, ...this.sortSearch];
+      if (orConditionList.length) {
+        form.orConditionList = orConditionList;
+      }
+      let res = await getDatasetList(form);
       this.loading = false;
       if (res.data.code === 1) {
         let { data, total } = res.data.data;

base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue

@@ -14,11 +14,6 @@
             v-model="searchForm.name"
             allowClear
           />
-          <a-input
-            placeholder="请输入二级组织搜索"
-            v-model="searchForm.secondOrganize"
-            allowClear
-          />
           <a-button type="primary" @click="onSearch">搜索</a-button>
           <a-button @click="resetSearch">重置</a-button>
         </a-space>
@@ -185,7 +180,6 @@ export default {
       searchValue: "", // 搜索
       searchForm: {
         name: "",
-        secondOrganize: "",
       },
       tableData: [],
       selectedRowKeys: [],
@@ -205,7 +199,6 @@ export default {
         page: this.current,
         size: this.size,
         name: `%${this.searchForm.name}%`,
-        secondOrganize: `%${this.searchForm.secondOrganize}%`,
       });
       this.loading = false;
       if (res.data.code == 1) {

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -56,12 +56,15 @@ POST {{baseUrl}}/app/dataset/list
 Content-Type: application/json
 
 {
-  "appId": 54,
-  "fieldCode": "title",
   "page": 1,
-  "size": 10
-
-
+  "size": 10,
+  "appId": "84",
+  "orConditionList": [
+    {
+      "fieldCode": "",
+      "fieldValue": "%%"
+    }
+  ]
 }
 
 

portal-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java

@@ -44,11 +44,11 @@ public class ExceptionHandle {
             ret.put(KEY_RESULT_MSG, ex.getMessage());
         } else if (e instanceof HttpMessageNotReadableException || e instanceof MethodArgumentTypeMismatchException) {
             log.error("[system error]", e);
-            response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
+            //response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
             ret.put(KEY_RESULT_MSG, "参数错误，" + StrUtil.subBefore(e.getMessage(), ";", false));
         } else {
             log.error("[system error]", e);
-            response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
+            //response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
             ret.put(KEY_RESULT_MSG, "未知错误!" + e.getMessage());
         }
         return ret.toJSONString();

portal-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -67,37 +67,6 @@ public class AuthUserInterceptor extends BaseInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
 
-        String referer = request.getHeader("Referer");
-        if (!ObjectUtils.isEmpty(referer)) {
-            //校验host即可
-            URI host = URLUtil.getHost(new URL(referer));
-            referer =  host.getHost();
-            List<String> trustReferers = StrUtil.split(trustedReferer, ",");
-            if (!ObjectUtils.isEmpty(trustReferers)) {
-                if (!trustReferers.contains(referer)) {
-                    response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
-                    return false;
-                }
-            }
-        }
-        //校验Origin
-        referer = request.getHeader("Origin");
-        if (!ObjectUtils.isEmpty(referer)) {
-            //校验host即可
-            URI host = URLUtil.getHost(new URL(referer));
-            referer =  host.getHost();
-            List<String> trustReferers = StrUtil.split(trustedReferer, ",");
-            if (!ObjectUtils.isEmpty(trustReferers)) {
-                if (!trustReferers.contains(referer)) {
-                    response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
-                    return false;
-                }
-            }
-        }
-
-//Origin
-
-
         JSONObject ret = new JSONObject();
         try {
             if (handler instanceof HandlerMethod) {