diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 0c8a7545..4e7ec7b5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -1945,7 +1945,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId); // 获取当前审批所在部门 -// Integer maindeparment = userByPort.getMaindeparment(); if (!flagForFirst) { diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index de677293..f0ef0977 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -63,7 +63,7 @@ } else { wxScan = wxScan.parent.wx; } - wxScan.scanQRCode({ + wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 diff --git a/src/main/resources/templates/pages/user/table-user.html b/src/main/resources/templates/pages/user/table-user.html index d3f45302..2683e069 100644 --- a/src/main/resources/templates/pages/user/table-user.html +++ b/src/main/resources/templates/pages/user/table-user.html @@ -63,9 +63,10 @@
diff --git a/src/main/resources/templates/pages/user/userRoleForIn.html b/src/main/resources/templates/pages/user/userRoleForIn.html index 26629f77..d973af2e 100644 --- a/src/main/resources/templates/pages/user/userRoleForIn.html +++ b/src/main/resources/templates/pages/user/userRoleForIn.html @@ -36,7 +36,7 @@ //第一个实例 table.render({ elem: '#demo' - , url: '/findUserInRole?userId=' + userId+'&classes=1', //数据接口 + , url: '/findUserInRole?uid=' + userId+'&classes=1', //数据接口 parseData: function (res) { //res 即为原始返回的数据 return { "status": res.status, //解析接口状态 diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java index 98053f97..429b13c3 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java @@ -36,6 +36,7 @@ import org.springframework.web.jsf.FacesContextUtils; import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Array; import java.net.URLEncoder; import java.util.*; import java.util.concurrent.*; @@ -67,7 +68,8 @@ public class TestForOther { // ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); // approver.setUserId("PangFuZhen"); // approvalInfo.setApprover(approver); -// depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"8ffd487e6b203bffa21142d383b70f47","2","202303240030", false,2); + List a = new ArrayList(Collections.singleton("1")); +// depositoryRecordService.reviewByQyWxApprovalOut("5",approvalInfo,"7a0ab47a150869808b24d2f4dbe1bb74","2","202303280016", false,2); // depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009"); // UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null); // List s = excelService.writeExcelForPrint(2, 4,userByPort); diff --git a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index de677293..f0ef0977 100644 --- a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -63,7 +63,7 @@ } else { wxScan = wxScan.parent.wx; } - wxScan.scanQRCode({ + wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有