diff --git a/login-base/src/main/resources/templates/login/form/list.html b/login-base/src/main/resources/templates/login/form/list.html
index 94fe5199..68bf355a 100644
--- a/login-base/src/main/resources/templates/login/form/list.html
+++ b/login-base/src/main/resources/templates/login/form/list.html
@@ -53,12 +53,13 @@
base: 'assets/layuiadmin/'
}).extend({
index: 'lib/index'
- }).use(['index', 'table', 'laydate', 'ztree'], function() {
+ }).use(['index', 'table', 'laydate', 'ztree', 'common'], function() {
var $ = layui.$;
var $win = $(window);
var table = layui.table;
var admin = layui.admin;
var laydate = layui.laydate;
+ var common = layui.common;
var tableUrl = 'api/login-form/listpage';
var viewer = new Viewer(document.getElementById('tableBody'));
@@ -115,8 +116,11 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
+ common.getImgBase64('route/file/download/true/'+ rowData, function(dataUrl) {
+ $('#'+ row.loginFormId +'Img').attr('src', dataUrl);
+ });
return '' +
- '
' +
+ '![]()
' +
'';
}
},
diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java
index 704c5eb7..6c21b39a 100644
--- a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java
+++ b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java
@@ -3,7 +3,7 @@ package ink.wgink.service.department.controller.route;
import ink.wgink.interfaces.consts.ISystemConstant;
import ink.wgink.interfaces.dictionary.IDictionaryCheckService;
import ink.wgink.util.ResourceUtil;
-import ink.wgink.util.request.RequestUtil;
+import ink.wgink.util.request.StaticResourceRequestUtil;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
/**
* When you feel like quitting. Think about why you started
@@ -109,8 +109,8 @@ public class DepartmentRouteController {
@GetMapping("upload/upload-excel-template")
public void excelTemplate(HttpServletResponse response) throws IOException {
- File template = ResourceUtil.getResourceFile("templates/department/upload/upload-excel-template.xls");
- RequestUtil.download(response, template, "组织部门导入模板.xls");
+ InputStream inputStream = ResourceUtil.getJarResourceInputStream("templates/department/upload/upload-excel-template.xls");
+ StaticResourceRequestUtil.download(response, inputStream, "导入模板.xls");
}
}
diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java
index 51d13b24..bc74eb1a 100644
--- a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java
+++ b/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentUserRouteController.java
@@ -44,4 +44,10 @@ public class DepartmentUserRouteController {
return modelAndView;
}
+ @GetMapping("select-user-v2")
+ public ModelAndView selectUserV2() {
+ ModelAndView modelAndView = new ModelAndView("department/user/select-user-v2");
+ return modelAndView;
+ }
+
}
diff --git a/service-department/src/main/resources/templates/department/upload/upload-excel.html b/service-department/src/main/resources/templates/department/upload/upload-excel.html
index 15a4a410..7088766a 100644
--- a/service-department/src/main/resources/templates/department/upload/upload-excel.html
+++ b/service-department/src/main/resources/templates/department/upload/upload-excel.html
@@ -36,11 +36,11 @@
var common = layui.common;
$('#downloadFile').click(function() {
- common.download('route/department/upload/upload-excel-template')
+ window.open('route/department/upload/upload-excel-template')
})
$(document).on('click', '.error-excel', function() {
- common.download('route/file/download/false/'+ this.dataset.errorId);
+ window.open('route/file/download/false/'+ this.dataset.errorId);
})
function closeBox() {
diff --git a/service-department/src/main/resources/templates/department/user/list.html b/service-department/src/main/resources/templates/department/user/list.html
index e7571629..62c0978c 100644
--- a/service-department/src/main/resources/templates/department/user/list.html
+++ b/service-department/src/main/resources/templates/department/user/list.html
@@ -205,7 +205,7 @@
title: '添加部门用户',
width: '800px',
height: '500px',
- closeBtn: 0,
+ closeBtn: 1,
onClose: function() {
reloadTable();
}
diff --git a/service-department/src/main/resources/templates/department/user/select-user-v2.html b/service-department/src/main/resources/templates/department/user/select-user-v2.html
index 73d35beb..7b50eb87 100644
--- a/service-department/src/main/resources/templates/department/user/select-user-v2.html
+++ b/service-department/src/main/resources/templates/department/user/select-user-v2.html
@@ -1,173 +1,40 @@
-
-
-
+
+
+
-
+
- Document
+
+
+
+
+
@@ -251,52 +118,67 @@
-
+
diff --git a/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java b/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java
index 6324ee0e..51e818ee 100644
--- a/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java
+++ b/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java
@@ -94,7 +94,7 @@ public class UserRouteController {
@GetMapping("upload/upload-excel-template")
public void excelTemplate(HttpServletResponse response) throws IOException {
InputStream inputStream = ResourceUtil.getJarResourceInputStream("templates/user/upload/upload-excel-template.xls");
- StaticResourceRequestUtil.download(response, inputStream, "upload-excel-template.xls");
+ StaticResourceRequestUtil.download(response, inputStream, "导入模板.xls");
}
}
diff --git a/service-user/src/main/resources/mybatis/mapper/user-adjustment-mapper.xml b/service-user/src/main/resources/mybatis/mapper/user-adjustment-mapper.xml
index 0aec78fc..da678974 100644
--- a/service-user/src/main/resources/mybatis/mapper/user-adjustment-mapper.xml
+++ b/service-user/src/main/resources/mybatis/mapper/user-adjustment-mapper.xml
@@ -78,6 +78,12 @@
AND (
+ user_name LIKE CONCAT('%', #{keywords}, '%')
+ OR
+ creator_name LIKE CONCAT('%', #{keywords}, '%')
+ OR
+ update_reason LIKE CONCAT('%', #{keywords}, '%')
+ OR
old_value LIKE CONCAT('%', #{keywords}, '%')
OR
new_value LIKE CONCAT('%', #{keywords}, '%')
diff --git a/service-user/src/main/resources/templates/user/upload/upload-excel.html b/service-user/src/main/resources/templates/user/upload/upload-excel.html
index 2bf927b9..8cab538a 100644
--- a/service-user/src/main/resources/templates/user/upload/upload-excel.html
+++ b/service-user/src/main/resources/templates/user/upload/upload-excel.html
@@ -37,11 +37,11 @@
var common = layui.common;
$('#downloadFile').click(function() {
- common.download('route/user/upload/upload-excel-template')
+ window.open('route/user/upload/upload-excel-template');
})
$(document).on('click', '.error-excel', function() {
- common.download('route/file/download/false/'+ this.dataset.errorId);
+ window.open('route/file/download/false/'+ this.dataset.errorId);
})
function closeBox() {