diff --git a/src/main/java/cn/com/tenlion/operator/controller/route/custompersonal/CustomPersonalRouteController.java b/src/main/java/cn/com/tenlion/operator/controller/route/custompersonal/CustomPersonalRouteController.java index 81daf57..033071e 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/route/custompersonal/CustomPersonalRouteController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/route/custompersonal/CustomPersonalRouteController.java @@ -1,6 +1,7 @@ package cn.com.tenlion.operator.controller.route.custompersonal; import cn.com.tenlion.operator.util.UserUtil; +import cn.com.tenlion.projectconfig.util.ProjectConfigUtil; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.component.SecurityComponent; import ink.wgink.interfaces.consts.ISystemConstant; @@ -58,4 +59,23 @@ public class CustomPersonalRouteController extends DefaultBaseController { return mv; } + @GetMapping("list-2") + public ModelAndView list2() { + ModelAndView mv = new ModelAndView("custompersonal/list-2"); + mv.addObject("AiServerUrl", ProjectConfigUtil.getText("AiServerUrl")); + userUtil.getIsAdmin(mv); + return mv; + } + + + @GetMapping("update-2") + public ModelAndView update2(String userInfoId) { + ModelAndView mv = new ModelAndView("custompersonal/update-2"); + mv.addObject("AiServerUrl", ProjectConfigUtil.getText("AiServerUrl")); + mv.addObject("userInfoId", userInfoId); + userUtil.getIsAdmin(mv); + return mv; + } + + } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/account/account-mapper.xml b/src/main/resources/mybatis/mapper/account/account-mapper.xml index 30dcef5..8940204 100644 --- a/src/main/resources/mybatis/mapper/account/account-mapper.xml +++ b/src/main/resources/mybatis/mapper/account/account-mapper.xml @@ -68,6 +68,7 @@ id1 = #{id1} ORDER BY id4 DESC + LIMIT 1 diff --git a/src/main/resources/templates/account/list.html b/src/main/resources/templates/account/list.html index 74d2503..0845fd9 100644 --- a/src/main/resources/templates/account/list.html +++ b/src/main/resources/templates/account/list.html @@ -84,7 +84,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'userDTO', width: 320, title: '系统用户', align:'center', + {field: 'userDTO', width: 300, title: '系统用户', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { diff --git a/src/main/resources/templates/accountrecharge/list.html b/src/main/resources/templates/accountrecharge/list.html index 9bdd536..480d39d 100644 --- a/src/main/resources/templates/accountrecharge/list.html +++ b/src/main/resources/templates/accountrecharge/list.html @@ -111,7 +111,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'userName', width: 180, title: '系统用户', align:'center', + {field: 'userName', width: 300, title: '系统用户', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { diff --git a/src/main/resources/templates/accountrecharge/pay.html b/src/main/resources/templates/accountrecharge/pay.html index d62bf2f..b56a35e 100644 --- a/src/main/resources/templates/accountrecharge/pay.html +++ b/src/main/resources/templates/accountrecharge/pay.html @@ -164,6 +164,9 @@ var restAjax = layui.restajax; var dataMessage = layui.datamessage; var laydate = layui.laydate; + window.dialog = dialog; + window.restAjax = restAjax; + window.dataMessage = dataMessage; var wangEditor = window.wangEditor; var wangEditorObj = {}; var viewerObj = {}; diff --git a/src/main/resources/templates/custompersonal/list-2.html b/src/main/resources/templates/custompersonal/list-2.html new file mode 100644 index 0000000..8dd554d --- /dev/null +++ b/src/main/resources/templates/custompersonal/list-2.html @@ -0,0 +1,347 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/custompersonal/update-2.html b/src/main/resources/templates/custompersonal/update-2.html new file mode 100644 index 0000000..6cdbae9 --- /dev/null +++ b/src/main/resources/templates/custompersonal/update-2.html @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + +
+
+
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/invoice/update.html b/src/main/resources/templates/invoice/update.html index 4e09240..f457bbf 100644 --- a/src/main/resources/templates/invoice/update.html +++ b/src/main/resources/templates/invoice/update.html @@ -22,7 +22,7 @@
- <
+