|
@@ -116,7 +116,7 @@ public class UserInfoServiceImpl implements UserInfoService {
|
|
116
|
userRole.setRoleId(Integer.parseInt(roleId));
|
116
|
userRole.setRoleId(Integer.parseInt(roleId));
|
|
117
|
userRoleMapper.insert(userRole);
|
117
|
userRoleMapper.insert(userRole);
|
|
118
|
}
|
118
|
}
|
|
119
|
- this.gjjjk(userInfo.getUserId(),userInfo.getOrgId(), "i");
|
|
|
|
|
|
119
|
+ //this.gjjjk(userInfo.getUserId(),userInfo.getOrgId(), "i");
|
|
120
|
}
|
120
|
}
|
|
121
|
|
121
|
|
|
122
|
@Override
|
122
|
@Override
|
|
@@ -308,11 +308,11 @@ public class UserInfoServiceImpl implements UserInfoService {
|
|
308
|
userRole.setUserId(userInfo.getUserId());
|
308
|
userRole.setUserId(userInfo.getUserId());
|
|
309
|
for (String id : idArray) {
|
309
|
for (String id : idArray) {
|
|
310
|
userRole.setRoleId(Integer.parseInt(id));
|
310
|
userRole.setRoleId(Integer.parseInt(id));
|
|
311
|
- userRoleMapper.insertSelective(userRole);
|
|
|
|
|
|
311
|
+ userRoleMapper.insert(userRole);
|
|
312
|
}
|
312
|
}
|
|
313
|
}
|
313
|
}
|
|
314
|
|
314
|
|
|
315
|
- if (StringUtils.isNotBlank(crkRoleIds)) {//保存出入库用户角色信息
|
|
|
|
|
|
315
|
+ if (StringUtils.isNotBlank(crkRoleIds) && !"[]".equals(crkRoleIds)) {//保存出入库用户角色信息
|
|
316
|
if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
|
316
|
if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
|
|
317
|
try {
|
317
|
try {
|
|
318
|
String json = "{userId:\""+userInfo.getUserId()+"\", roleIds:"+crkRoleIds+"}";
|
318
|
String json = "{userId:\""+userInfo.getUserId()+"\", roleIds:"+crkRoleIds+"}";
|