fix: 87489 外来标准法规文本库--查询--责任人查询失败

This commit is contained in:
2024-07-29 15:58:33 +08:00
parent 467ea3336a
commit 5b2f02ae58
@@ -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<String> 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<EnterpriseStandardAuthDept> authDeptWrapper = new LambdaQueryWrapper<>();
List<String> authDeptIdList = Arrays.asList(authDept.split(","));
authDeptWrapper.in(EnterpriseStandardAuthDept::getAuthDept, authDeptIdList);
List<EnterpriseStandardAuthDept> 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<String> 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 ");
}