From 5d9e2fbeab87327ce11080485bf4d971f93f542a Mon Sep 17 00:00:00 2001
From: admin <ak473600000>
Date: Sat, 26 Jun 2021 18:03:20 +0800
Subject: [PATCH] 修复bug

---
 zq-erp/src/main/resources/templates/views/admin/index.html                          |    6 +
 zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java |    3 
 zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java                    |    2 
 zq-erp/src/main/resources/templates/views/admin/hive/vip/question-list.html         |    2 
 zq-erp/pom.xml                                                                      |    4 
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form-bak.html |    5 -
 zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html         |    2 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java |   25 +++++---
 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java     |    4 +
 zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java                           |   12 +---
 zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java          |    3 
 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java           |   27 ++-------
 zq-erp/src/main/resources/config/application.properties                             |    2 
 zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml                       |    5 +
 zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java            |    2 
 zq-erp/src/main/resources/权限                                                        |   24 -------
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java    |    4 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java             |    3 
 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html          |   17 +++++
 19 files changed, 68 insertions(+), 84 deletions(-)

diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index ed1dc1f..111a11a 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -401,12 +401,12 @@
                     <exclude>config/xcx/*</exclude>
                     <exclude>config/xcshop/*</exclude>
 
-                    <!---->
+                    <!--
                     <exclude>config/config.json</exclude>
                     <exclude>config/application.properties</exclude>
                     <exclude>config/system.properties</exclude>
 
-
+-->
 
                     <exclude>**/*.woff</exclude>
                     <exclude>**/*.woff2</exclude>
diff --git a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
index 03cb319..54801c7 100644
--- a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
@@ -66,16 +66,10 @@
 				.excludePathPatterns("/webjars/**");
 
 		// 用户认证拦截
-//		registry.addInterceptor(userLoginInterceptor)
-//				.addPathPatterns("/**")
-//				.excludePathPatterns("/common/**")
-//				.excludePathPatterns("/resource/**")
-//				.excludePathPatterns("/swagger**/**")
-//				.excludePathPatterns("/webjars/**")
-//				.excludePathPatterns("/api/**");
+		registry.addInterceptor(userLoginInterceptor)
+				.addPathPatterns("/admin/**");
 
-		// url权限拦截
-		registry.addInterceptor(suAuthorityInterceptor).addPathPatterns("/**/su/**");
+
 		//小程序公司与域名对应关系拦截
 		registry.addInterceptor(hostInterceptor).addPathPatterns("/**/wxapi/**")
 				.excludePathPatterns("/wxCommon/wxapi/wxpayCallback")
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index bac7d9e..d9987fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -191,7 +191,8 @@
     @GetMapping(value = "/findVipQuestions/{vipId}")
     public AjaxResult findVipQuestions(@PathVariable("vipId") Long vipId) {
         // 获取会员所有的答案,分类型
-        List<Question> questions = questionSerivce.findByVipId(vipId);
+        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+        List<Question> questions = questionSerivce.findByVipId(vipId,user.getCompanyId());
         AjaxResult result = AjaxResult.buildSuccessInstance("获取成功");
         List<QuestionVo> list = QuestionMapper.INSTANCE.entitiesToVos(questions);
         result.putInMap("questions", list);
diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java
index e1e5bb3..9603548 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java
@@ -33,10 +33,11 @@
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
 
-		String requestUrl = request.getRequestURI();
+ 		String requestUrl = request.getRequestURI();
 		// 如果访问特殊的路径需要验证管理员的登录权限
 		if (requestUrl.indexOf(ADMIN) != -1 || requestUrl.indexOf(SUPER) != -1
 				|| requestUrl.indexOf(DEVELOPER) != -1 || requestUrl.indexOf(CUSTOMER) != -1) {
+
 			if (WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY) == null) {
 				// 判断是否为异步请求
 				String requestType = request.getHeader(X_REQUESTED_WITH);
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java
index 1b8c0b4..80835bf 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java
@@ -153,7 +153,8 @@
 	@RequestMapping(value = "/findVipQuestionVipId")
 	public String findVipQuestionVipId(Long id) {
 		//获取会员所有的答案,分类型
-		List<Question> questions=questionSerivce.findByVipId(id);
+		SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+		List<Question> questions=questionSerivce.findByVipId(id,user.getCompanyId());
 		WebUtil.getRequest().setAttribute("questions", questions);
 		return "admin/hive/mobile/CRM-account-detail";
 		
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index aa8f6b4..3b7e203 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -135,9 +135,9 @@
             vips.get(0).setLabels(sysVipLabelDao.selectByVipId(vips.get(0).getId()));
             vips.get(0).setAge(DateUtil.getAgeForBirthDay(vips.get(0).getBirthday1()));
             vips.get(0).setBalance(moneyCardUseDao.selectVipCardTotalMoney(vips.get(0).getId()));
-            AjaxResult result=  new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
+            AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
             return result;
-        }else{
+        } else {
             return AjaxResult.buildFailInstance("未查到询客户信息");
         }
 
@@ -162,25 +162,9 @@
     public @ResponseBody
     AjaxResult addOrModify(SysVipInfo vipInfo) {
         if (vipInfo.getId() != null) {
-
-            try {
-                if (vipInfo.getPassWord() != null) {
-                    vipInfo.setPassWord(EncrypUtil.getMD5(vipInfo.getPassWord()));
-                }
-            } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
-                e.printStackTrace();
-            }
             return modify(vipInfoService, vipInfo, "会员信息");
         } else {
-
-            try {
-                if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
-                    vipInfo.setPassWord(EncrypUtil.getMD5(vipInfo.getPassWord()));
-                }
-                vipInfo.setVipState(Dictionary.VIP_STATE_HY);
-            } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
-                e.printStackTrace();
-            }
+            vipInfo.setVipState(Dictionary.VIP_STATE_HY);
             SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
             vipInfo.setShopId(users.getShopId());
             return add(vipInfoService, vipInfo, "会员信息");
@@ -253,7 +237,8 @@
     public @ResponseBody
     AjaxResult getVipQuestions(Long id, HttpServletRequest request) {
         // 获取会员所有的答案,分类型
-        List<Question> questions = questionSerivce.findByVipId(id);
+        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+        List<Question> questions = questionSerivce.findByVipId(id, user.getCompanyId());
         request.setAttribute("questions", questions);
         AjaxResult result = new AjaxResult();
         result.putInMap("questions", questions);
@@ -317,7 +302,7 @@
         SystemDictionary dataDictionary = new SystemDictionary();
         // 获取到店途径
         dataDictionary.setType("到店途径");
-        WebUtil.getRequest().setAttribute("ddtj", customerDataDictionaryDao.selectByParentCode("DDTJ",getMe().getCompanyId()));
+        WebUtil.getRequest().setAttribute("ddtj", customerDataDictionaryDao.selectByParentCode("DDTJ", getMe().getCompanyId()));
         // 获取生肖
         dataDictionary.setType("生肖");
         WebUtil.getRequest().setAttribute("sx", dataDictionaryService.findByModel(dataDictionary));
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java
index 19a388a..b102348 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java
@@ -47,6 +47,6 @@
 	 * @param type 问卷分类
 	 * @return
 	 */
-	public List<Question> selectVipAnswerAllByModel(@Param("id") Long id, @Param("type") String type);
+	public List<Question> selectVipAnswerAllByModel(@Param("id") Long id,@Param("companyId") Long companyId, @Param("type") String type);
 	
 }
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java b/zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java
index 44b94b7..c986c81 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java
@@ -77,7 +77,7 @@
 	 * luokai
 	 * @return
 	 */
-	public List<Question> findByVipId(Long id);
+	public List<Question> findByVipId(Long id,Long companyId);
 
    	
 
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java
index b37bbfd..5cb357a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java
@@ -175,12 +175,12 @@
 	 * @return
 	 */
 	@Override
-	public List<Question> findByVipId(Long id) {
+	public List<Question> findByVipId(Long id,Long companyId) {
 
 
 
 
-		List<Question> vipAnswerList=quesionDao.selectVipAnswerAllByModel(id,Question.TYPE_ZXDAGL);
+		List<Question> vipAnswerList=quesionDao.selectVipAnswerAllByModel(id,companyId,Question.TYPE_ZXDAGL);
 
 		
 		return vipAnswerList;
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
index 77ccadb..793ae96 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -99,16 +99,21 @@
 	public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) {
 		if(beginTime!=null){
 			Date minTime = findMinTime(shopId);
-			Date maxTime = findMaxTime(shopId);
-			minTime.setYear(beginTime.getYear());
-			minTime.setMonth(beginTime.getMonth());
-			minTime.setDate(beginTime.getDate());
-			maxTime.setYear(beginTime.getYear());
-			maxTime.setMonth(beginTime.getMonth());
-			maxTime.setDate(beginTime.getDate());
-			return (
-					(DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime()  )
-							&& DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
+			if(minTime!=null){
+				Date maxTime = findMaxTime(shopId);
+				minTime.setYear(beginTime.getYear());
+				minTime.setMonth(beginTime.getMonth());
+				minTime.setDate(beginTime.getDate());
+				maxTime.setYear(beginTime.getYear());
+				maxTime.setMonth(beginTime.getMonth());
+				maxTime.setDate(beginTime.getDate());
+				return (
+						(DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime()  )
+								&& DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
+			}else {
+				return false;
+			}
+
 		}else{
 			return false;
 		}
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
index a412f07..bc1e2a2 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
@@ -2,6 +2,7 @@
 
 import com.matrix.core.anotations.RemoveRequestToken;
 import com.matrix.core.anotations.SaveRequestToken;
+import com.matrix.core.constance.MatrixConstance;
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.DateUtil;
@@ -223,7 +224,8 @@
     public @ResponseBody
     AjaxResult getVipQuestions(Long id, HttpServletRequest request) {
         // 获取会员所有的答案,分类型
-       List<Question> questions = questionSerivce.findByVipId(id);
+        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+        List<Question> questions=questionSerivce.findByVipId(id,user.getCompanyId());
         request.setAttribute("questions", questions);
         AjaxResult result = new AjaxResult();
         result.putInMap("questions", questions);
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 66e9789..18196de 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -6,7 +6,7 @@
 #
 spring.datasource.username=ct_test
 spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
 #spring.datasource.username=xc_shop
 #spring.datasource.password=xc_shop123!@#
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml
index 9d9e344..ea70d23 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml
@@ -50,7 +50,10 @@
 	FROM
 		question a
 	LEFT JOIN vip_answer b ON a.id = b.quesion_id and b.vip_id=#{id}
-	WHERE category=#{type}
+	WHERE
+	a.company_id=#{companyId}
+	and category=#{type}
+
 	ORDER BY order_field DESC
 	</select>
 	
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form-bak.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form-bak.html
index 9a6be74..bfc2a09 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form-bak.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form-bak.html
@@ -109,7 +109,6 @@
                                         <th width="100px">服务时长(分钟)</th>
                                         <th>服务时间</th>
                                         <th width="300px">美疗师</th>
-                                        <th style="width: 100px;">提成</th>
                                     </tr>
 
                                     <tr v-for="(item,index) in projService.serviceItems">
@@ -150,9 +149,7 @@
                                                 </el-option>
                                             </el-select>
                                         </td>
-                                        <td>
-                                            <el-input v-model="item.extract"></el-input>
-                                        </td>
+
 
                                     </tr>
 
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html
index acad6d3..d556c5f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html
@@ -41,7 +41,7 @@
                         th:data-url="@{/admin/dataDictionary/showDataDictionary}"
                         data-filed="name"
                         data-value="name"
-                        data-param="{type:'字段类型'}"
+                        data-param="{type:'问卷类型'}"
                         th:data-def="${obj?.type }"
                 >
                     <option value="">--请选择字段类型--</option>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-list.html
index 0ee705e..d57d3a0 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/question-list.html
@@ -45,7 +45,7 @@
                             th:data-url="@{/admin/dataDictionary/showDataDictionary}"
                             data-filed="name"
                             data-value="name"
-                            data-param="{type:'字段类型'}"
+                            data-param="{type:'问卷类型'}"
                     >
                         <option value="">请选择字段类型</option>
                     </select>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html
index 2d7895b..c6e1c38 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html
@@ -175,9 +175,9 @@
                             </div>
 
                             <div class="form-group">
-                                <label class="col-sm-2 control-label">美疗师<span class="text-danger">*</span></label>
+                                <label class="col-sm-2 control-label">美疗师</label>
                                 <div class="col-sm-4">
-                                    <select class="form-control autoFull select2" dataType="*" nullmsg="请选择美疗师"
+                                    <select class="form-control autoFull select2" dataType="*" nullmsg="请选择美疗师"  ignore="ignore"
                                             th:data-url="@{/admin/getShopStaffByRoleName?roleName=美疗师}"
                                             data-value="suId"
                                             data-filed="suName" th:data-def="${obj?.beatuyId}" name="beatuyId"
@@ -217,6 +217,19 @@
                                     <div class="Validform_checktip"></div>
                                 </div>
                             </div>
+
+                            <div class="form-group">
+
+                                <label class="col-sm-2 control-label">资金密码</label>
+                                <div class="col-sm-4">
+                                    <input autocomplete="off"   type="input" class="form-control" name="passWord"
+                                           th:value="${obj?.passWord}" datatype="*0-500" ignore="ignore">
+                                    <div class="Validform_checktip"></div>
+                                </div>
+
+                            </div>
+
+
                         </div>
                     </div>
             </div>
diff --git a/zq-erp/src/main/resources/templates/views/admin/index.html b/zq-erp/src/main/resources/templates/views/admin/index.html
index f3bb64a..219d21a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/index.html
+++ b/zq-erp/src/main/resources/templates/views/admin/index.html
@@ -85,11 +85,13 @@
                 </div>
                 <div class=" hidden-xs">
                     <div style="text-align:right;font-size: 14px; " >
-
                          <span style="line-height: 35px; display: inline-block; " th:utext="${session.userInfo.shopName}+' | '"></span>
                         <i class="fa fa-user" ></i>
-                        <span style="line-height: 35px; color: #333; " th:utext="${session.userInfo.suName}">
+                        <span style="line-height: 35px; color: #333; " th:utext="${session.userInfo.suName}+' | '">
                         </span>
+                        <a style="line-height: 35px; color: #333; " target="_blank" href="https://www.yuque.com/books/share/70c39d28-6aac-4763-ae92-899ea5822a0d" >
+                            <i class="fa fa-book" aria-hidden="true"></i>
+                            帮助手册</a>
                     </div>
 
                 </div>
diff --git "a/zq-erp/src/main/resources/\346\235\203\351\231\220" "b/zq-erp/src/main/resources/\346\235\203\351\231\220"
index 2ae0118..2b38d8a 100644
--- "a/zq-erp/src/main/resources/\346\235\203\351\231\220"
+++ "b/zq-erp/src/main/resources/\346\235\203\351\231\220"
@@ -1,22 +1,2 @@
-<button  matrix:btn="orderClub-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
-<button  matrix:btn="orderClub-del"  class="btn btn-danger btn-sm mr-5" onClick="cancelOrder()"  ><i class="fa fa-trash-o fa-fw"></i> 取消</button>
-
-<script matrix:btn="orderClub-look"  >
-    btns[0]='<li> <button class="btn btn-default btn-sm mr-5" onClick="openLook(\'VALUE\')"  title="查看详情"><i class="fa fa-eye fa-trash-o">查看</i></buttoun></li>'
-</script>
-<script matrix:btn="orderClub-payment"  >
-    btns[1]='<li> <button class="btn btn-default btn-sm mr-5" onclick="openBj(\'VALUE\')" title=补交"><i class="fa fa-sign-in">补交</i></button></li>'
-</script>
-<script matrix:btn="orderClub-gathering"  >
-    btns[2]='<li> <button class="btn btn-default btn-sm mr-5" onclick="openEdit(\'VALUE\')" title="收款"><i class="fa fa-edit">收款</i></button></li>'
-</script>
-<script matrix:btn="orderClub-edit"  >
-    btns[3]='<li> <button class="btn btn-default btn-sm mr-5" onclick="updateTime(\'VALUE\')" title="修改时间"><i class="fa fa-edit">修改时间</i></button></li>'
-</script>
-
-
- var btns=[];
- btns[0]="",btns[1]="",btns[2]="",btns[3]="",btns[4]="";
- 
- 
- btns[0].replace('VALUE',value);
\ No newline at end of file
+select ID, NAME, TYPE, code from sys_data_dictionary where 1=1 and TYPE like CONCAT('%',?,'%')
+ 2021-06-26 16:36:49.487-[ TR = rGpKxAflK1Qt5O66 ] [ DEBUG ]-[ http-nio-8080-exec-3 ] ==> Parameters: 字段类型(String)
\ No newline at end of file

--
Gitblit v1.9.1