From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/Service/FrameService/src/com/vci/server/framework/right/roleRight/RoleRightService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Source/Service/FrameService/src/com/vci/server/framework/right/roleRight/RoleRightService.java b/Source/Service/FrameService/src/com/vci/server/framework/right/roleRight/RoleRightService.java
index 25537ea..eb25cd5 100644
--- a/Source/Service/FrameService/src/com/vci/server/framework/right/roleRight/RoleRightService.java
+++ b/Source/Service/FrameService/src/com/vci/server/framework/right/roleRight/RoleRightService.java
@@ -57,7 +57,7 @@
}
String hql = "delete RoleRight where roleId = ? and rightType=?";
- impl.createQuery(hql, new Object[] { roleId.trim(), rightType });
+ impl.createQuery(hql, new Object[] { roleId.trim(), (short)rightType });
return true;
}
});
@@ -76,7 +76,7 @@
// 娉ㄩ噴鏍规嵁rightType鍒犻櫎瑙掕壊鏉冮檺锛岄伩鍏嶇鐞嗗憳瑙掕壊鍜屾櫘閫氱敤鎴疯鑹茬浉浜掑奖鍝�
String hql = "delete RoleRight where rightType = ? and roleId = ? ";
Object[] values = new Object[2];
- values[0] = rightType;
+ values[0] = (short)rightType;
values[1] = roleId;
impl.createQuery(hql, values);
@@ -176,7 +176,7 @@
private void prepareCreateBOPsmt(PreparedStatement pst, RoleRight roleRight) throws SQLException {
pst.setString(1, roleRight.getRoleId());
pst.setString(2, roleRight.getFuncId());
- pst.setLong(3, roleRight.getRightType());
+ pst.setShort(3, roleRight.getRightType());
pst.setLong(4, roleRight.getRightValue());
pst.setString(5, roleRight.getCreateUser());
pst.setTimestamp(6, new Timestamp(roleRight.getCreateTime().getTime()));
@@ -201,7 +201,7 @@
/** 鑾峰彇鎵�閫夎鑹插凡鏈夌殑妯″潡鎺堟潈 **/
String hql = "from RoleRight where rightType = ? and roleId = ? ";
Object[] values = new Object[2];
- values[0] = rightType;
+ values[0] = (short)rightType;
values[1] = roleId;
List<RoleRight> myRoleRights = impl.findEntites(hql, values);
List<String> funcIds = new ArrayList<String>();
@@ -241,15 +241,16 @@
return (List<RoleRight>) new HibernateTemplate().run(new HibernateCallback() {
public Object execute() throws HibernateException {
RoleRightDaoImpl impl = new RoleRightDaoImpl();
- String hql = "from RoleRight where rightType = ? and roleId = ? ";
+ String hql = "";
if (rightType == 0) {
hql = "from RoleRight where roleId = ? ";
Object[] values = new Object[1];
values[0] = roleId;
return impl.findEntites(hql, values);
} else {
+ hql = "from RoleRight where rightType = ? and roleId = ? ";
Object[] values = new Object[2];
- values[0] = rightType;
+ values[0] = (short)rightType;
values[1] = roleId;
return impl.findEntites(hql, values);
}
--
Gitblit v1.9.3