purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决演示平台的用户角色被误改的问题

Browse Source
This commit is contained in:
季圣华
2019-04-05 17:40:05 +08:00
parent 134724670c
commit 7b029187e5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erp_web/pages/manage/user.html
View File

@@ -182,8 +182,8 @@
+ 'AaBb' + rec.orgAbr + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager + 'AaBb' + rec.orgAbr + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager
+ 'AaBb' + rec.isystem + 'AaBb' + rec.description+'AaBb'+rec.orgaId+'AaBb'+rec.orgaUserRelId + 'AaBb' + rec.isystem + 'AaBb' + rec.description+'AaBb'+rec.orgaId+'AaBb'+rec.orgaUserRelId
+'AaBb' + rec.userBlngOrgaDsplSeq ; +'AaBb' + rec.userBlngOrgaDsplSeq ;
if (0 == value) { str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editUser(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editUser(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;'; if (rec.id != rec.tenantId) {
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>&nbsp;<a onclick="deleteUser(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;'; str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>&nbsp;<a onclick="deleteUser(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
} }
else { else {
@@ -312,6 +312,9 @@
if(row[i].loginame == "jsh"){ if(row[i].loginame == "jsh"){
$.messager.alert('提示', '管理员jsh不能删除！', 'warning'); $.messager.alert('提示', '管理员jsh不能删除！', 'warning');
return; return;
} else if(row[i].id == row[i].tenantId) {
$.messager.alert('提示', '不能删除自己！', 'warning');
return;
} else { } else {
$.ajax({ $.ajax({
type: "post", type: "post",
@@ -525,6 +528,10 @@
$.messager.alert('提示',"请选择一条数据再操作！",'warning'); $.messager.alert('提示',"请选择一条数据再操作！",'warning');
return false; return false;
} }
if (currentRow.id == currentRow.tenantId) {
$.messager.alert('提示',"不能给自己配置角色！",'warning');
return false;
}
this.href = "/pages/user/userRole.html?id=" + currentRow.id; this.href = "/pages/user/userRole.html?id=" + currentRow.id;
}); });

2
src/main/resources/mapper_xml/UserMapperEx.xml
View File

@@ -37,7 +37,7 @@
</select> </select>
<select id="getUserList" parameterType="java.util.Map" resultMap="ResultMapEx"> <select id="getUserList" parameterType="java.util.Map" resultMap="ResultMapEx">
select user.id, user.username, user.loginame, user.position, user.email, user.phonenum, select user.id, user.username, user.loginame, user.position, user.email, user.phonenum,
user.description, user.remark,user.isystem,org.id as orgaId,org.org_abr,rel.user_blng_orga_dspl_seq, user.description, user.remark,user.isystem,org.id as orgaId,user.tenant_id,org.org_abr,rel.user_blng_orga_dspl_seq,
rel.id as orgaUserRelId rel.id as orgaUserRelId
FROM jsh_user user FROM jsh_user user
left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1' left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'