From a20f92890fd1434fffc57e2a0e5dc2dac0e89b68 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 1 Jan 2025 00:39:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=90=9C=E7=B4=A2=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E6=85=A2=EF=BC=8C=E7=BB=99=E7=A7=9F=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8E=BB=E6=8E=89=E8=A7=92=E8=89=B2=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/mappers/TenantMapperEx.java | 2 -- .../erp/service/tenant/TenantComponent.java | 6 ++-- .../jsh/erp/service/tenant/TenantService.java | 8 ++--- .../resources/mapper_xml/TenantMapperEx.xml | 12 ++----- jshERP-web/src/views/system/TenantList.vue | 34 +++++-------------- 5 files changed, 16 insertions(+), 46 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java index 8d8b0f8ce..fbb8748ff 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java @@ -10,7 +10,6 @@ public interface TenantMapperEx { List selectByConditionTenant( @Param("loginName") String loginName, - @Param("roleId") Long roleId, @Param("type") String type, @Param("enabled") String enabled, @Param("remark") String remark, @@ -19,7 +18,6 @@ public interface TenantMapperEx { Long countsByTenant( @Param("loginName") String loginName, - @Param("roleId") Long roleId, @Param("type") String type, @Param("enabled") String enabled, @Param("remark") String remark); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java index cf0ff0ffb..470a65e4a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java @@ -34,22 +34,20 @@ public class TenantComponent implements ICommonQuery { private List getTenantList(Map map)throws Exception { String search = map.get(Constants.SEARCH); String loginName = StringUtil.getInfo(search, "loginName"); - Long roleId = StringUtil.parseStrLong(StringUtil.getInfo(search, "roleId")); String type = StringUtil.getInfo(search, "type"); String enabled = StringUtil.getInfo(search, "enabled"); String remark = StringUtil.getInfo(search, "remark"); - return tenantService.select(loginName, roleId, type, enabled, remark, QueryUtils.offset(map), QueryUtils.rows(map)); + return tenantService.select(loginName, type, enabled, remark, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override public Long counts(Map map)throws Exception { String search = map.get(Constants.SEARCH); String loginName = StringUtil.getInfo(search, "loginName"); - Long roleId = StringUtil.parseStrLong(StringUtil.getInfo(search, "roleId")); String type = StringUtil.getInfo(search, "type"); String enabled = StringUtil.getInfo(search, "enabled"); String remark = StringUtil.getInfo(search, "remark"); - return tenantService.countTenant(loginName, roleId, type, enabled, remark); + return tenantService.countTenant(loginName, type, enabled, remark); } @Override diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java index 91a300a09..a41c40852 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java @@ -75,11 +75,11 @@ public class TenantService { return list; } - public List select(String loginName, Long roleId, String type, String enabled, String remark, int offset, int rows)throws Exception { + public List select(String loginName, String type, String enabled, String remark, int offset, int rows)throws Exception { List list= new ArrayList<>(); try{ if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) { - list = tenantMapperEx.selectByConditionTenant(loginName, roleId, type, enabled, remark, offset, rows); + list = tenantMapperEx.selectByConditionTenant(loginName, type, enabled, remark, offset, rows); if (null != list) { for (TenantEx tenantEx : list) { tenantEx.setCreateTimeStr(Tools.getCenternTime(tenantEx.getCreateTime())); @@ -93,11 +93,11 @@ public class TenantService { return list; } - public Long countTenant(String loginName, Long roleId, String type, String enabled, String remark)throws Exception { + public Long countTenant(String loginName, String type, String enabled, String remark)throws Exception { Long result=null; try{ if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) { - result = tenantMapperEx.countsByTenant(loginName, roleId, type, enabled, remark); + result = tenantMapperEx.countsByTenant(loginName, type, enabled, remark); } }catch(Exception e){ JshException.readFail(logger, e); diff --git a/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml index ede9af44c..f17045711 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/TenantMapperEx.xml @@ -18,15 +18,11 @@ where ub.type='UserRole' and ub.key_id=t.tenant_id limit 0,1) roleName, (select count(jsh_user.id) from jsh_user where jsh_user.status='0' and jsh_user.delete_flag=0 and jsh_user.tenant_id=t.tenant_id) userCount from jsh_tenant t - left join jsh_user_business ub on ub.key_id = t.tenant_id and ifnull(ub.delete_flag,'0') !='1' - where ub.type='UserRole' + where 1=1 and t.login_name like #{bindLoginName} - - and ub.value = concat("[",#{roleId},"]") - and t.type = #{type} @@ -48,15 +44,11 @@ select count(t.id) from jsh_tenant t - left join jsh_user_business ub on ub.key_id = t.tenant_id and ifnull(ub.delete_flag,'0') !='1' - where ub.type='UserRole' + where 1=1 and t.login_name like #{bindLoginName} - - and ub.value = concat("[",#{roleId},"]") - and t.type = #{type} diff --git a/jshERP-web/src/views/system/TenantList.vue b/jshERP-web/src/views/system/TenantList.vue index 6240f5f00..79810fef6 100644 --- a/jshERP-web/src/views/system/TenantList.vue +++ b/jshERP-web/src/views/system/TenantList.vue @@ -11,15 +11,6 @@ - - - - - {{ item.name }} - - - - @@ -28,6 +19,14 @@ + + + + 启用 + 禁用 + + + 查询 @@ -39,14 +38,6 @@