bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

机具库存收藏修改

This commit is contained in:
jiang 2025-09-15 10:22:01 +08:00
parent 1e3b66e9e6
commit 7621de57f3
3 changed files with 311 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/mybatis/ma/MachineTypeMapper.xml
View File

@ -723,9 +723,6 @@
AND mat4.IS_ACTIVE = '1' AND mat4.IS_ACTIVE = '1'
and mat.PARENT_ID = #{param.parentId} and mat.PARENT_ID = #{param.parentId}
<if test="param.companyId != 1 and param.companyId != '1'">
and mr.ORG_ID = #{param.companyId}
</if>
<if test="param.keyWord != null and param.keyWord != ''"> <if test="param.keyWord != null and param.keyWord != ''">
and ( and (
mat.`NAME` like CONCAT('%',#{param.keyWord},'%') or mat.`NAME` like CONCAT('%',#{param.keyWord},'%') or

24
src/com/bonus/bm/controller/ProjectManageController.java
View File

@ -77,18 +77,18 @@ public class ProjectManageController extends BaseController<ProjectManageBean> {
} }
// 2. 时间戳校验（防重放） // 2. 时间戳校验（防重放）
try { // try {
Date time = DateUtil.parse(timestamp, "yyyyMMddHHmmss"); // Date time = DateUtil.parse(timestamp, "yyyyMMddHHmmss");
long diff = Math.abs(System.currentTimeMillis() - time.getTime()); // long diff = Math.abs(System.currentTimeMillis() - time.getTime());
if (diff > 5 * 60 * 1000) { // if (diff > 5 * 60 * 1000) {
result.setFailMsg("请求时间戳不合法!!"); // result.setFailMsg("请求时间戳不合法!!");
return result; // return result;
} // }
} catch (Exception e) { // } catch (Exception e) {
System.err.println("时间戳解析异常:" + timestamp + "," + e.getMessage()); // System.err.println("时间戳解析异常:" + timestamp + "," + e.getMessage());
result.setFailMsg("时间戳解析异常"); // result.setFailMsg("时间戳解析异常");
return result; // return result;
} // }
// 3. 验证签名 // 3. 验证签名
String baseSign = appId + timestamp + encryptedData + appSecret; String baseSign = appId + timestamp + encryptedData + appSecret;