From 967ff1f8998636aa42e89a37d5500b9e390175be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 16 Dec 2020 23:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/user.html                | 62 -------------------
 .../resources/mapper_xml/UserMapperEx.xml     | 15 ++---
 2 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 9481c01f..79aaca0e 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -208,14 +208,6 @@
                     handler: function () {
                         addUser();
                     }
-                },'-',
-                {
-                    id: 'deleteUser',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteUser();
-                    }
                 }
             ],
             onLoadError: function () {
@@ -300,60 +292,6 @@
         });
     }
 
-    //批量删除用户
-    function batDeleteUser() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条用户信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        ids += row[i].id + ",";
-                    }
-                    if(row[i].loginName == "jsh"){
-                        $.messager.alert('提示', '租户jsh不能删除！', 'warning');
-                        return;
-                    } else if(row[i].id == row[i].tenantId) {
-                        $.messager.alert('提示', '不能删除自己！', 'warning');
-                        return;
-                    } else {
-                        $.ajax({
-                            type: "post",
-                            url: "/user/batchDeleteUser",
-                            dataType: "json",
-                            async: false,
-                            data: ({
-                                ids: ids,
-                            }),
-                            success: function (res) {
-                                if(res && res.code != 200) {
-                                    $.messager.alert('提示', res.msg, 'error');
-                                    return;
-                                }
-                                $.messager.alert('提示', res.msg, 'info');
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            },
-                            //此处添加错误处理
-                            error: function () {
-                                $.messager.alert('删除提示', '删除用户信息异常，请稍后再试！', 'error');
-                                return;
-                            }
-                        });
-                    }
-                }
-            });
-        }
-    }
-
     //增加用户
     var url;
     var userID = 0;
diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml
index 1c89c782..1d0d3767 100644
--- a/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -10,15 +10,12 @@
     </resultMap>
     <select id="selectByConditionUser" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="ResultMapEx">
         select user.id, user.username, user.login_name, user.position, user.email, user.phonenum,
-        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, tb.roleName
-        FROM jsh_user user
-        left join
-        (
-        select ub.*,r.name roleName from jsh_user_business ub
+        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,
+        (select r.name from jsh_user_business ub
         inner join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
-        where ub.type='UserRole'
-        ) tb on tb.key_id=user.id
+        where ub.type='UserRole' and ub.key_id=user.id) roleName
+        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_organization org on rel.orga_id=org.id and  ifnull(org.org_stcd,'0') !='5'
         where 1=1
@@ -38,12 +35,10 @@
         select count(user.id)
         FROM jsh_user user
         left join jsh_user_business ub on user.id=ub.key_id
-        left join jsh_role r on ub.value=concat("[",r.id,"]") and ifnull(r.delete_flag,'0') !='1'
         left join jsh_orga_user_rel rel on user.id=rel.user_id and ifnull(rel.delete_flag,'0') !='1'
         left join jsh_organization org on rel.orga_id=org.id and  ifnull(org.org_stcd,'0') !='5'
         where 1=1
         and ifnull(user.status,'0') not in('1','2')
-        and ub.type='UserRole'
         <if test="userName != null">
             and user.username like '%${userName}%'
         </if>