Merge remote-tracking branch 'origin/master'

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

@@ -77,7 +77,7 @@
         </template>
         <!-- 类型 -->
         <template slot="appType" slot-scope="text">
-          {{ text.appType === 1 ? "应用程序" : "URL" }}
+          {{ appType[text.appType] }}
         </template>
         <!-- 上下架 -->
         <template slot="shelves" slot-scope="text">
@@ -150,6 +150,13 @@ import {
 import local from "@/utils/local";
 import { mapMutations, mapGetters } from "vuex";
 import { pageSizeOptions } from "@/config/pageConfig.js";
+let appType = {
+  1: "应用程序",
+  2: "URL",
+  3: "微信小程序",
+  4: "天府通办",
+  5: "Router",
+};
 const columns = [
   {
     title: "序号",
@@ -211,6 +218,7 @@ export default {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
+      appType,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据
       loading: false,

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

@@ -77,7 +77,7 @@
         </template>
         <!-- 类型 -->
         <template slot="appType" slot-scope="text">
-          {{ text.appType === 1 ? "应用程序" : "URL" }}
+          {{ appType[text.appType] }}
         </template>
         <!-- 上下架 -->
         <template slot="shelves" slot-scope="text">
@@ -150,6 +150,13 @@ import {
 import local from "@/utils/local";
 import { mapMutations, mapGetters } from "vuex";
 import { pageSizeOptions } from "@/config/pageConfig.js";
+let appType = {
+  1: "应用程序",
+  2: "URL",
+  3: "微信小程序",
+  4: "天府通办",
+  5: "Router",
+};
 const columns = [
   {
     title: "序号",
@@ -211,6 +218,7 @@ export default {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
+      appType,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据
       loading: false,

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue

@@ -83,6 +83,7 @@
               <a-radio :value="2"> URL </a-radio>
               <a-radio :value="3" v-if="form.type != 1"> 微信小程序 </a-radio>
               <a-radio :value="4" v-if="form.type != 2"> 天府通办 </a-radio>
+              <a-radio :value="5"> Router </a-radio>
             </a-radio-group>
           </a-form-model-item>
           <a-form-model-item
@@ -406,6 +407,7 @@ export default {
     // 改变类型
     changeAppType(e) {
       let val = e.target.value;
+      this.$refs.form.clearValidate(["url", "filePath"]);
       if (val == 1) {
         this.form.url = "";
       } else {

base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java

 package com.mortals.xhx.module.area.service.impl;
 
 import com.mortals.framework.common.Rest;
-import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
-import com.mortals.xhx.module.area.model.AreaEntity;
-import com.mortals.xhx.module.area.model.AreaQuery;
-import com.mortals.xhx.module.area.model.AreaTreeSelect;
-import com.mortals.xhx.module.base.service.BaseAreaService;
-import com.mortals.xhx.module.site.service.SiteService;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.common.code.SatusEnum;
 import com.mortals.xhx.module.area.dao.AreaDao;
+import com.mortals.xhx.module.area.model.AreaEntity;
+import com.mortals.xhx.module.area.model.AreaQuery;
+import com.mortals.xhx.module.area.model.AreaTreeSelect;
 import com.mortals.xhx.module.area.service.AreaService;
+import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -195,12 +194,12 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
     @Override
     public List<AreaTreeSelect> getListByParentId(String parentId, Context context) {
         if (ObjectUtils.isEmpty(parentId)) {
-            parentId = "0";
+            parentId = "%0%";
         }
         //只做一层
         List<AreaTreeSelect> collect = this.find(new AreaQuery().pid(parentId), context).stream().map(item -> new AreaTreeSelect(item)
         ).collect(Collectors.toList());
-        if ("0".equals(parentId)) {
+        if ("%0%".equals(parentId)) {
             return collect;
         }
 //        AreaEntity areaEntity = this.selectOne(new AreaQuery().iid(parentId));

base-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -22,9 +22,9 @@
 			<property name="showSql" value="false" />
 		</plugin>
 
-<!--		<plugin interceptor="com.mortals.framework.thirty.dm.DmTransInterceptor">
-
-		</plugin>-->
+		<plugin interceptor="com.mortals.framework.thirty.dm.DmTransInterceptor">
+			<property name="showSql" value="false" />
+		</plugin>
 
 	</plugins>
 </configuration>
\ No newline at end of file

portal-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -8,6 +8,7 @@
 		<setting name="useColumnLabel" value="true" />
 		<setting name="useGeneratedKeys" value="false" />
 		<setting name="defaultExecutorType" value="REUSE" />
+
 	</settings>
 	<plugins>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">
@@ -18,5 +19,8 @@
 			<property name="enableExecutorTime" value="true" />
 			<property name="showSql" value="false" />
 		</plugin>
+		<plugin interceptor="com.mortals.framework.thirty.dm.DmTransInterceptor">
+			<property name="showSql" value="false" />
+		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file