diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/OwnerController.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/OwnerController.java index 362214b..e27ddef 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/OwnerController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/OwnerController.java @@ -75,8 +75,9 @@ public class OwnerController { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } return new PageTableHandler(new PageTableHandler.CountHandler() { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/WorkPlanAllController.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/WorkPlanAllController.java index 7154e58..735f1e3 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/WorkPlanAllController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/WorkPlanAllController.java @@ -45,9 +45,10 @@ public class WorkPlanAllController { public PageTableResponse listProjects(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String proName = (String) request.getParams().get("proName"); - if (proName != null && !proName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in proName."); + if (proName != null && !proName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 只允许字母、数字和空格 + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } + return new PageTableHandler(new PageTableHandler.CountHandler() { @Override public int count(PageTableRequest request) { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OrgBean.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OrgBean.java index 4195621..6f3661d 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OrgBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OrgBean.java @@ -20,4 +20,9 @@ public class OrgBean { private String companyIds; + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; + } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OwnerBean.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OwnerBean.java index 0072712..8b1c9e3 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OwnerBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/OwnerBean.java @@ -23,4 +23,9 @@ public class OwnerBean { private String isActive; + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; + } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ZNode.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ZNode.java index 6409c06..ed4cbb5 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ZNode.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ZNode.java @@ -26,6 +26,11 @@ public class ZNode { private String icon; + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; + @Override public String toString() { return "ZNode{" + @@ -160,4 +165,12 @@ public class ZNode { public void setForeignId(String foreignId) { this.foreignId = foreignId; } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/controller/WorkPayController.java b/modules/bmw/src/main/java/com/bonus/bmw/person/controller/WorkPayController.java index 96020e0..bf21a55 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/controller/WorkPayController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/controller/WorkPayController.java @@ -45,8 +45,9 @@ public class WorkPayController { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel(); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/planAndRealName/controller/PlanAndRealNameController.java b/modules/bmw/src/main/java/com/bonus/bmw/planAndRealName/controller/PlanAndRealNameController.java index 65d73f6..632aa33 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/planAndRealName/controller/PlanAndRealNameController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/planAndRealName/controller/PlanAndRealNameController.java @@ -134,9 +134,11 @@ public class PlanAndRealNameController { public PageTableResponse getFbListByCacheList(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } + return new PageTableHandler(new PageTableHandler.CountHandler() { @Override public int count(PageTableRequest request) { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractController.java b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractController.java index fc20829..2ee801e 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractController.java @@ -44,8 +44,9 @@ public class SubContractController { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } SelfPermissionSettingUtils.getSelfPermission(request); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractorController.java b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractorController.java index 2622b8b..98d3949 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractorController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/controller/SubContractorController.java @@ -41,13 +41,13 @@ public class SubContractorController { public PageTableResponse listProjects(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String subName = (String) request.getParams().get("subName"); - if (subName != null && !subName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in subName."); + if (subName != null && !subName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String legalName = (String) request.getParams().get("legalName"); - if (legalName != null && !legalName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in legalName."); + if (legalName != null && !legalName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } SelfPermissionSettingUtils.getSelfPermission(request); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractorBean.java b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractorBean.java index 26190e1..8646de9 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractorBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subContractor/entity/SubContractorBean.java @@ -43,6 +43,9 @@ public class SubContractorBean { private int workingWorker;//在场 施工人员 private int allWorker;//全部 施工人员 - + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; } \ No newline at end of file diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubBlackController.java b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubBlackController.java index a32e472..ea162af 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubBlackController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubBlackController.java @@ -43,8 +43,9 @@ public class SubBlackController { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } return new PageTableHandler(new PageTableHandler.CountHandler() { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubCertificateTypeController.java b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubCertificateTypeController.java index 6820513..5bda1ba 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubCertificateTypeController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/controller/SubCertificateTypeController.java @@ -28,9 +28,12 @@ public class SubCertificateTypeController { public PageTableResponse getList(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } + int i = 0 ; return new PageTableHandler(new PageTableHandler.CountHandler() { @Override diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateTypeBean.java b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateTypeBean.java index 3564af1..e7111ae 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateTypeBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subcontract/entity/SubCertificateTypeBean.java @@ -2,6 +2,9 @@ package com.bonus.bmw.subcontract.entity; import lombok.Data; +/** + * @author fl + */ @Data public class SubCertificateTypeBean { private String id; // @@ -10,4 +13,9 @@ public class SubCertificateTypeBean { private String isDelete; //是否可以删除 private String createTime; //创建时间 private String updateTime; //修改时间 + + /** + * 是否可以删除，0可以删除，1不能删除 + */ + private String isDel; } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubCompareController.java b/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubCompareController.java index 3584bd0..b978c46 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubCompareController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubCompareController.java @@ -37,9 +37,10 @@ public class SubCompareController { public PageTableResponse listSubCompany(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String subName = (String) request.getParams().get("subName"); - if (subName != null && !subName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in subName."); + if (subName != null && !subName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } + Map params = request.getParams(); String reasonSelect = (String) params.get("reasonSelect"); if(StringUtils.isEmpty(reasonSelect)){ diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubEndyearController.java b/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubEndyearController.java index d194455..35b726c 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubEndyearController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubEndyearController.java @@ -38,8 +38,8 @@ public class SubEndyearController { // 输入验证：过滤掉可能的恶意字符 String subName = (String) request.getParams().get("subName"); - if (subName != null && !subName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in subName."); + if (subName != null && !subName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 只允许字母、数字和空格 + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } Map params = request.getParams(); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubProjectController.java b/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubProjectController.java index a416547..b5e7b58 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubProjectController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/subeva/controller/SubProjectController.java @@ -173,8 +173,8 @@ public class SubProjectController { public PageTableResponse getList(PageTableRequest request) { String subName = (String) request.getParams().get("subName"); - if (subName != null && !subName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in subName."); + if (subName != null && !subName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 只允许字母、数字和空格 + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } Map params = request.getParams(); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/JobPointSettingController.java b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/JobPointSettingController.java index f78afdd..5cb5785 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/JobPointSettingController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/JobPointSettingController.java @@ -71,8 +71,9 @@ public class JobPointSettingController { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } return new PageTableHandler(new PageTableHandler.CountHandler() { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java index 37b4f2c..c2bbd24 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamAttendController.java @@ -55,8 +55,9 @@ public class NoSignalTeamAttendController { public PageTableResponse listProjects(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel(); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java index 628cd81..3cf139d 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/team/controller/NoSignalTeamSetUpController.java @@ -36,8 +36,9 @@ public class NoSignalTeamSetUpController { // 输入验证：过滤掉可能的恶意字符 String keyWord = (String) request.getParams().get("keyWord"); - if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in keyWord."); + // 允许字母、数字、中文、空格、连字符、下划线、点（常用于型号或关键词） + if (keyWord != null && !keyWord.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel(); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/SupplyChainBlackListController.java b/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/SupplyChainBlackListController.java index 51875eb..6290e63 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/SupplyChainBlackListController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/SupplyChainBlackListController.java @@ -56,29 +56,29 @@ public class SupplyChainBlackListController { public PageTableResponse getBlackList(PageTableRequest request) { // 输入验证：过滤掉可能的恶意字符 String event = (String) request.getParams().get("event"); - if (event != null && !event.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in event."); + if (event != null && !event.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String idNumber = (String) request.getParams().get("idNumber"); - if (idNumber != null && !idNumber.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in idNumber."); + if (idNumber != null && !idNumber.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String name = (String) request.getParams().get("name"); - if (name != null && !name.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in name."); + if (name != null && !name.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String proName = (String) request.getParams().get("proName"); - if (proName != null && !proName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in proName."); + if (proName != null && !proName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String subName = (String) request.getParams().get("subName"); - if (subName != null && !subName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in subName."); + if (subName != null && !subName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/ViolationBlackListController.java b/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/ViolationBlackListController.java index c24d7bc..34bd814 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/ViolationBlackListController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/whiteBlackList/controller/ViolationBlackListController.java @@ -55,29 +55,29 @@ public class ViolationBlackListController { // 输入验证：过滤掉可能的恶意字符 String event = (String) request.getParams().get("event"); - if (event != null && !event.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in event."); + if (event != null && !event.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String idNumber = (String) request.getParams().get("idNumber"); - if (idNumber != null && !idNumber.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in idNumber."); + if (idNumber != null && !idNumber.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String name = (String) request.getParams().get("name"); - if (name != null && !name.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in name."); + if (name != null && !name.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String proName = (String) request.getParams().get("proName"); - if (proName != null && !proName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in proName."); + if (proName != null && !proName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } String subName = (String) request.getParams().get("subName"); - if (subName != null && !subName.matches("[a-zA-Z0-9\\s]*")) { // 只允许字母、数字和空格 - throw new IllegalArgumentException("Invalid characters in subName."); + if (subName != null && !subName.matches("[a-zA-Z0-9\\u4e00-\\u9fa5\\s\\-_.]*")) { // 关键词包含非法字符，仅支持中英文、数字、空格及 - _ . + throw new IllegalArgumentException("关键词包含非法字符，仅支持中英文、数字、空格及 - _ ."); } return new PageTableHandler(new PageTableHandler.CountHandler() { diff --git a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml index 7f97265..d771eab 100644 --- a/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml +++ b/modules/bmw/src/main/resources/mapper/SubContractor/SubContractorMapper.xml @@ -17,7 +17,8 @@ bs.back_idcard_path as backIdcardPath, bs.seal_path as sealPath, bs.sign_path as signPath, - count(DISTINCT bsc.sub_id) as subContractNum + count(DISTINCT bsc.sub_id) as subContractNum, + IF(bsc.sub_id IS NOT NULL, 1, 0) AS isDel from bm_subcontractor bs LEFT JOIN pm_organization po ON po.id = bs.org_id and po.IS_ACTIVE = '1' diff --git a/modules/bmw/src/main/resources/mapper/basic/OrgMapper.xml b/modules/bmw/src/main/resources/mapper/basic/OrgMapper.xml index 2b5c3ea..499b281 100644 --- a/modules/bmw/src/main/resources/mapper/basic/OrgMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/OrgMapper.xml @@ -11,10 +11,12 @@ po.PARENT_ID AS pId , po.COMPANY_ID as companyId, po.`NAME` as name, - po.foreign_id as foreignId + po.foreign_id as foreignId, + IF(bp.id IS NOT NULL, 1, 0) AS isDel FROM pm_organization po LEFT JOIN pm_company pc on po.COMPANY_ID = pc.ID + LEFT JOIN bm_project bp ON bp.company_id = po.id AND bp.is_active = '1' WHERE po.is_active = '1' @@ -23,7 +25,7 @@ and po.ID in (${childList}) - + GROUP BY po.ID - select count(*) from bm_owner where `name` = #{name} and owner_name = #{ownerName} + select count(*) + from bm_owner + where `name` = #{name} + and owner_name = #{ownerName} update bm_owner - set `name` = #{name}, - owner_name = #{ownerName}, - owner_phone = #{ownerPhone}, - update_time = now() + set `name` = #{name}, + owner_name = #{ownerName}, + owner_phone = #{ownerPhone}, + update_time = now() where ID = #{id} - update bm_owner set is_active = '0' where id = #{id} + update bm_owner + set is_active = '0' + where id = #{id} \ No newline at end of file diff --git a/modules/bmw/src/main/resources/mapper/subcontract/SubCertificateTypeMapper.xml b/modules/bmw/src/main/resources/mapper/subcontract/SubCertificateTypeMapper.xml index 19ca282..9d11f0c 100644 --- a/modules/bmw/src/main/resources/mapper/subcontract/SubCertificateTypeMapper.xml +++ b/modules/bmw/src/main/resources/mapper/subcontract/SubCertificateTypeMapper.xml @@ -26,8 +26,10 @@ bsct.remake AS remake, bsct.is_delete AS isDelete, bsct.create_time AS createTime, - bsct.update_time AS updateTime + bsct.update_time AS updateTime, + IF(bsc.id IS NOT NULL, 1, 0) AS isDel FROM bm_subcontractor_certificate_type bsct + LEFT JOIN bm_subcontractor_certificate bsc ON bsct.id = bsc.certificate_id and bsc.is_active='1' WHERE bsct.is_active = '1' and ( @@ -36,6 +38,7 @@ bsct.update_time like concat('%', #{params.keyWord}, '%') ) + GROUP BY bsct.id limit #{offset},#{limit}