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

由于搜索速度慢，给租户管理去掉角色的查询条件

Browse Source
This commit is contained in:
jishenghua
2025-01-01 00:39:22 +08:00
parent 1d0cb1d904
commit a20f92890f
5 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
View File

@@ -10,7 +10,6 @@ public interface TenantMapperEx {
List<TenantEx> 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);

6
jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
View File

@@ -34,22 +34,20 @@ public class TenantComponent implements ICommonQuery {
private List<?> getTenantList(Map<String, String> 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<String, String> 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

8
jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
View File

@@ -75,11 +75,11 @@ public class TenantService {
return list;
}
public List<TenantEx> select(String loginName, Long roleId, String type, String enabled, String remark, int offset, int rows)throws Exception {
public List<TenantEx> select(String loginName, String type, String enabled, String remark, int offset, int rows)throws Exception {
List<TenantEx> 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);