优化删除的逻辑，

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() {

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) {

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;
+
 }

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;
+
 }

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;
+	}
 }

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();

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) {

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);

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);

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;
 
 }

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() {

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

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;
 }

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<String, Object> params = request.getParams();
         String reasonSelect = (String) params.get("reasonSelect");
         if(StringUtils.isEmpty(reasonSelect)){

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<String, Object> params = request.getParams();

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<String, Object> params = request.getParams();

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() {

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();

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();

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("关键词包含非法字符，仅支持中英文、数字、空格及 - _ .");
         }
 
 

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() {

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'

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'
         <if test="companyId!=null and companyId!='' ">
@@ -23,7 +25,7 @@
         <if test="childList!=null and childList!='' ">
             and po.ID in (${childList})
         </if>
-
+        GROUP BY po.ID
     </select>
 
     <select id="getAllRl" parameterType="com.bonus.bmw.basic.entity.OrgBean" resultMap="ZNode">

modules/bmw/src/main/resources/mapper/basic/OwnerMapper.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.bonus.bmw.basic.dao.OwnerDao">
 
     <insert id="addOwner">
-        INSERT INTO `bm_owner`( `name` ,`owner_name`, `owner_phone`,`create_time`, `update_time`, `is_active`)
-        VALUES (#{name},#{ownerName}, #{ownerPhone}, now(), now(), '1');
+        INSERT INTO `bm_owner`(`name`, `owner_name`, `owner_phone`, `create_time`, `update_time`, `is_active`)
+        VALUES (#{name}, #{ownerName}, #{ownerPhone}, now(), now(), '1');
     </insert>
 
     <insert id="importData">
         INSERT INTO `bm_owner`( `name` ,`owner_name`, `owner_phone`,`create_time`, `update_time`, `is_active`)
         VALUES
-        <foreach item="item" collection="list" separator="," index="index" >
+        <foreach item="item" collection="list" separator="," index="index">
             (
             #{item.name},
             #{item.ownerName},
@@ -23,55 +23,78 @@
     </insert>
 
     <select id="addOwnerIsPd" resultType="java.lang.Integer">
-        select count(*) from bm_owner where `name` = #{name} and owner_name = #{ownerName}
+        select count(*)
+        from bm_owner
+        where `name` = #{name}
+          and owner_name = #{ownerName}
     </select>
 
     <update id="updateOwner">
         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>
 
     <delete id="deleteOwner">
-        update bm_owner set is_active = '0' where id = #{id}
+        update bm_owner
+        set is_active = '0'
+        where id = #{id}
     </delete>
 
     <select id="getOwnerList" resultType="com.bonus.bmw.basic.entity.OwnerBean">
-        SELECT id,`name`,owner_name as ownerName,owner_phone as ownerPhone FROM bm_owner
-        where is_active = '1'
+        SELECT bo.id,
+        bo.`name`,
+        bo.owner_name AS ownerName,
+        bo.owner_phone AS ownerPhone,
+        bp.id ,
+        IF(bp.id IS NOT NULL, 1, 0) AS isDel
+        FROM bm_owner bo
+        LEFT JOIN bm_project bp ON bp.owner_id = bo.id AND bp.is_active ='1'
+        where bo.is_active = '1'
         <if test="params.keyWord != null and params.keyWord != ''">
             and (
-            owner_name like concat('%', #{params.keyWord}, '%') or
-            owner_phone like concat('%', #{params.keyWord}, '%') or
-            `name` like concat('%', #{params.keyWord}, '%'))
+            bo.owner_name like concat('%', #{params.keyWord}, '%') or
+            bo.owner_phone like concat('%', #{params.keyWord}, '%') or
+            bo.`name` like concat('%', #{params.keyWord}, '%'))
         </if>
-        GROUP BY update_time desc
+        GROUP BY bo.id
+        ORDER BY bo.update_time desc
         limit #{offset},#{limit}
     </select>
 
     <select id="getOwnerCount" resultType="java.lang.Integer">
-        SELECT count(id) FROM bm_owner where is_active = '1'
+        SELECT count(*) FROM(
+        SELECT bo.id,
+        bo.`name`,
+        bo.owner_name AS ownerName,
+        bo.owner_phone AS ownerPhone
+        FROM bm_owner bo
+        where bo.is_active = '1'
         <if test="params.keyWord != null and params.keyWord != ''">
             and (
-            owner_name like concat('%', #{params.keyWord}, '%') or
-            owner_phone like concat('%', #{params.keyWord}, '%') or
-            `name` like concat('%', #{params.keyWord}, '%'))
+            bo.owner_name like concat('%', #{params.keyWord}, '%') or
+            bo.owner_phone like concat('%', #{params.keyWord}, '%') or
+            bo.`name` like concat('%', #{params.keyWord}, '%'))
         </if>
+        )a
     </select>
 
     <select id="getOwnerById" resultType="com.bonus.bmw.basic.entity.OwnerBean">
-        SELECT id,name,owner_name as ownerName,owner_phone as ownerPhone FROM bm_owner
-        where is_active = '1' and id = #{id}
+        SELECT id, name, owner_name as ownerName, owner_phone as ownerPhone
+        FROM bm_owner
+        where is_active = '1'
+          and id = #{id}
     </select>
 
     <select id="getOwnerByName" resultType="java.lang.Integer">
-        SELECT count(*) FROM bm_owner
+        SELECT count(*)
+        FROM bm_owner
         where is_active = '1'
-        and `name` = #{name}
-        and owner_name = #{ownerName}
-        and owner_phone = #{ownerPhone}
+          and `name` = #{name}
+          and owner_name = #{ownerName}
+          and owner_phone = #{ownerPhone}
     </select>
 </mapper>

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'
         <if test="params.keyWord != null and params.keyWord != ''">
             and (
@@ -36,6 +38,7 @@
                 bsct.update_time like concat('%', #{params.keyWord}, '%')
             )
         </if>
+        GROUP BY bsct.id
         limit #{offset},#{limit}
     </select>
     <select id="getListCount" resultType="java.lang.Integer">

modules/bmw/src/main/resources/static/js/work/ProjectManage/ownerManage.js

@@ -102,9 +102,12 @@ function init() {
                     "orderable": false,
                     "render": function (data, type, row) {
                         var id = row['id'];
+                        var isDel = row['isDel'];
                         var html = '';
                         html += buttonEdits(id, "sys:owner:add", pers);
-                        html += buttonDel(id, "sys:owner:del", pers);
+                        if(isDel == 0 || isDel == '0'){
+                            html += buttonDel(id, "sys:owner:del", pers);
+                        }
                         html += buttonView(id, "sys:owner:query", pers);
                         return html;
                     }

modules/bmw/src/main/resources/static/js/work/SettingManage/OrgManage/OrgList.js

@@ -63,16 +63,23 @@ function beforeRename(treeId, treeNode, newName) {
 
 //确认是否删除+删除处理
 function beforeRemove(treeId, treeNode) {
+	console.log("项目部(组织管理)",treeNode)
 	if(treeNode.id==1){
 		layer.alert("根节点不能删除",{
 			icon: 2,
-			time: 2000
+			time: 3000
 		});
 		return false;
-	}else if(treeNode.foreignId != null){
+	}else if(treeNode.isDel =="1" || treeNode.isDel ==1){
+		layer.alert("此节点在“专业录入”功能中使用不能删除！",{
+			icon: 2,
+			time: 3000
+		});
+		return false;
+	} else if(treeNode.foreignId != null){
 		layer.alert("模块公司节点在此不能删除！",{
 			icon: 2,
-			time: 2000
+			time: 3000
 		});
 		return false;
 	}

modules/bmw/src/main/resources/static/js/work/SubContractor/BasicMsg/SubContractor.js

@@ -151,9 +151,12 @@ function init() {
                     "render": function (data, type, row) {
                         var id = row['id'];
                         var subContractNum = row['subContractNum'];
+                        var isDel = row['isDel'];
                         var html = '';
                         html += buttonEdits(id, "sys:subContractor:update", pers);
-                        html += buttonDel(id,subContractNum, "sys:subContractor:del", pers);
+                        if(isDel == 0 || isDel == '0'){
+                            html += buttonDel(id,subContractNum, "sys:subContractor:del", pers);
+                        }
                         return html;
                     }
                 },

modules/bmw/src/main/resources/static/js/work/SubManage/subCertificateTypeList.js

@@ -102,10 +102,13 @@ function init() {
                     "render": function (data, type, row) {
                         var id = row['id']
                         var isDelete = row['isDelete']
+                        var isDel = row['isDel']
                         var html = ''
                         if(isDelete == '0'){
                             html += buttonUpd(id, "sys:subCertificateType:update", pers);
-                            html += buttonDel(id, "sys:subCertificateType:del", pers);
+                            if(isDel == '0' || isDel == 0){
+                                html += buttonDel(id, "sys:subCertificateType:del", pers);
+                            }
                         }
                         return html;
                     }

modules/system/src/main/resources/mapper/basic/SelectMapper.xml

@@ -294,6 +294,7 @@
 			bsct.id,
 			bsct.`name`
 		FROM bm_subcontractor_certificate_type bsct
+		WHERE is_active = '1'
 	</select>
 
 	<select id="getCertificateSub" resultType="com.bonus.system.api.domain.SelectBean">