From 5b2f02ae58e1781892b5c1910a203b58b88b4174 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 29 Jul 2024 15:58:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087489=20=E5=A4=96=E6=9D=A5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=96=87=E6=9C=AC=E5=BA=93--?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index f3695c84..b627d952 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -35,7 +35,6 @@ import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; @@ -2060,20 +2059,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 拼接多表关联查询条件 Set idSet = new HashSet<>(); boolean idSearch = false; - // 授权部门 - if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { - // 授权部门 - String authDept = (String) parameterMap.get(FieldCommon.AUTH_DEPT); - if (StrUtil.isNotBlank(authDept)) { - idSearch = true; - LambdaQueryWrapper authDeptWrapper = new LambdaQueryWrapper<>(); - List authDeptIdList = Arrays.asList(authDept.split(",")); - authDeptWrapper.in(EnterpriseStandardAuthDept::getAuthDept, authDeptIdList); - List authList = enterpriseAuthDeptService.list(authDeptWrapper); - idSet.addAll(authList.stream().map(EnterpriseStandardAuthDept::getStandardId).collect(Collectors.toSet())); - parameterMap.remove(FieldCommon.AUTH_DEPT); - } - } // 管理员有所有外标的权限 adminRoleCodeList.addAll(enterpriseDetailRoleCodeList); // 体系 @@ -2222,7 +2207,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List strData = Arrays.asList(value.split(",")); StringBuilder str = new StringBuilder(); for (int i = 0; i < strData.size(); i++) { - str.append("realname").append(" like '%").append(strData.get(i)).append("%' "); + str.append("CONCAT(realname, '(', username, ')')").append(" like '%").append(strData.get(i)).append("%' "); if (i != strData.size() - 1) { str.append(" and "); }