|
|
@@ -143,9 +143,22 @@ public class RoleInfoController {
|
|
143
|
143
|
@RequestMapping(value="/getRoleIdByUserId")
|
|
144
|
144
|
public Integer getRoleIdByUserId(Integer Id) {
|
|
145
|
145
|
Integer roleId = null;
|
|
|
146
|
+ String roleName ="";
|
|
|
147
|
+ RoleInfo roleInfo = new RoleInfo();
|
|
146
|
148
|
if (Id != null) {
|
|
147
|
149
|
roleId = roleInfoService.findByuserId(Id);
|
|
148
|
150
|
}
|
|
|
151
|
+ if (roleId != null) {
|
|
|
152
|
+ roleInfo = roleInfoService.findById(roleId);
|
|
|
153
|
+ roleName = roleInfo.getRoleName();
|
|
|
154
|
+ if (roleName.equals("保管员")){
|
|
|
155
|
+ roleId = roleInfo.getRoleId();
|
|
|
156
|
+ }else {
|
|
|
157
|
+ roleId = null;
|
|
|
158
|
+ }
|
|
|
159
|
+
|
|
|
160
|
+ }
|
|
|
161
|
+
|
|
149
|
162
|
return roleId;
|
|
150
|
163
|
}
|
|
151
|
164
|
|