diff --git a/src/main/java/com/zcloud/controller/safetyMeeting/SafetyMeetingController.java b/src/main/java/com/zcloud/controller/safetyMeeting/SafetyMeetingController.java
new file mode 100644
index 0000000..6cfa506
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/safetyMeeting/SafetyMeetingController.java
@@ -0,0 +1,114 @@
+package com.zcloud.controller.safetyMeeting;
+
+import com.alibaba.fastjson.JSON;
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.safetyMeeting.SafetyMeetingService;
+import com.zcloud.util.InitPageDataUtil;
+import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.ReturnMap;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/safetyMeeting")
+public class SafetyMeetingController extends BaseController {
+
+    @Resource
+    private SafetyMeetingService safetyMeetingService;
+    @Resource
+    private InitPageDataUtil initPageDataUtil;
+
+    /**
+     * @Description: 安全例会新增
+     * @Author: dearLin
+     * @Date: 2024/2/6/006 14:09
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/add")
+    // @RequiresPermissions("safetyMeeting:add")
+    @ResponseBody
+    public Object add() throws Exception {
+        PageData pageData = getPageData();
+        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+
+        initPageDataUtil.initSave(pageData,"SAFETY_MEETING_ID");
+        safetyMeetingService.save(pageData);
+        return ReturnMap.ok();
+    }
+
+    /**
+     * @Description: 安全例会删除
+     * @Author: dearLin
+     * @Date: 2024/2/6/006 14:09
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/delete")
+    // @RequiresPermissions("safetyMeeting:del")
+    @ResponseBody
+    public Object delete() throws Exception {
+        PageData pageData = getPageData();
+        initPageDataUtil.initEdit(pageData);
+        safetyMeetingService.removeById(pageData);
+        return ReturnMap.ok();
+    }
+
+    /**
+     * @Description: 安全例会列表
+     * @Author: dearLin
+     * @Date: 2024/2/6/006 14:09
+     * @Param: [com.zcloud.entity.Page] [page]
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/list")
+    // @RequiresPermissions("safetyMeeting:list")
+    @ResponseBody
+    public Object list(Page page) throws Exception {
+        PageData pageData = getPageData();
+        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        page.setPd(pageData);
+        return ReturnMap.ok().put("varList", safetyMeetingService.list(page)).put("page",page);
+    }
+
+    /**
+     * @Description: 安全例会详情
+     * @Author: dearLin
+     * @Date: 2024/2/6/006 14:10
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/goEdit")
+    // @RequiresPermissions("safetyMeeting:list")
+    @ResponseBody
+    public Object goEdit() throws Exception {
+        PageData pageData = getPageData();
+        return ReturnMap.ok().put("pd", safetyMeetingService.findById(pageData));
+    }
+    /**
+     * @Description: 安全例会 修改
+     * @Author: dearLin
+     * @Date: 2024/2/6/006 14:10
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/edit")
+    // @RequiresPermissions("safetyMeeting:list")
+    @ResponseBody
+    public Object edit() throws Exception {
+        PageData pageData = getPageData();
+        safetyMeetingService.edit(pageData);
+        return ReturnMap.ok();
+    }
+}
diff --git a/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java b/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java
new file mode 100644
index 0000000..262f66a
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/safetyMeeting/app/AppSafetyMeetingController.java
@@ -0,0 +1,24 @@
+package com.zcloud.controller.safetyMeeting.app;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.util.ReturnMap;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("app/safetyMeeting")
+public class AppSafetyMeetingController extends BaseController {
+
+    @RequestMapping(value = "/list")
+    // @RequiresPermissions("safetyMeeting:list")
+    @ResponseBody
+    public Object list() throws Exception {
+        return ReturnMap.ok();
+    }
+}
diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java
index 08be169..32b16ea 100644
--- a/src/main/java/com/zcloud/controller/system/UsersController.java
+++ b/src/main/java/com/zcloud/controller/system/UsersController.java
@@ -83,8 +83,8 @@ public class UsersController extends BaseController {
     @ResponseBody
     public Object getUserByCardNo() {
         PageData pageData = getPageData();
-        pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
-        return ReturnMap.ok().put("pd",usersService.getUserByCardNo(pageData));
+        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        return ReturnMap.ok().put("pd", usersService.getUserByCardNo(pageData));
     }
 
     /**
@@ -2446,7 +2446,6 @@ public class UsersController extends BaseController {
     @RequestMapping(value = "/listAllByCorp")
     @ResponseBody
     @LogAnno(menuType = "监测预警", menuServer = "在线监测", instructionsOperate = "智能预警", instructionsType = "列表")
-
     public Object listAllByCorp() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
diff --git a/src/main/java/com/zcloud/mapper/datasource/safetyMeeting/SafetyMeetingMapper.java b/src/main/java/com/zcloud/mapper/datasource/safetyMeeting/SafetyMeetingMapper.java
new file mode 100644
index 0000000..62926c1
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/safetyMeeting/SafetyMeetingMapper.java
@@ -0,0 +1,23 @@
+package com.zcloud.mapper.datasource.safetyMeeting;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+public interface SafetyMeetingMapper {
+    void save(PageData pageData);
+
+    void removeById(PageData pageData);
+
+    List<PageData> datalistPage(Page page);
+
+    PageData findById(PageData pageData);
+
+    void edit(PageData pageData);
+}
diff --git a/src/main/java/com/zcloud/mapper/datasource/safetyMeeting/SafetyMeetingPeopleMapper.java b/src/main/java/com/zcloud/mapper/datasource/safetyMeeting/SafetyMeetingPeopleMapper.java
new file mode 100644
index 0000000..cf9991e
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/safetyMeeting/SafetyMeetingPeopleMapper.java
@@ -0,0 +1,14 @@
+package com.zcloud.mapper.datasource.safetyMeeting;
+
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+public interface SafetyMeetingPeopleMapper {
+    void saveBatch(List<PageData> safetyMeetingPeopledataList);
+}
diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java
index e298de1..a016cb9 100644
--- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java
@@ -5,6 +5,7 @@ import com.zcloud.entity.PageData;
 import com.zcloud.entity.system.Department;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 说明： 组织机构接Mapper
@@ -163,5 +164,7 @@ public interface DepartmentMapper{
 	List<PageData> saftmanagelist(PageData pd);
 
 	List<PageData> saftpersonlist(PageData pd);
+
+	List<Map<String, Object>> getDeptAllByCorp(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/safetyMeeting/SafetyMeetingService.java b/src/main/java/com/zcloud/service/safetyMeeting/SafetyMeetingService.java
new file mode 100644
index 0000000..e6e96b9
--- /dev/null
+++ b/src/main/java/com/zcloud/service/safetyMeeting/SafetyMeetingService.java
@@ -0,0 +1,23 @@
+package com.zcloud.service.safetyMeeting;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+public interface SafetyMeetingService {
+    void save(PageData pageData);
+
+    void removeById(PageData pageData);
+
+    List<PageData> list(Page page);
+
+    PageData findById(PageData pageData);
+
+    void edit(PageData pageData);
+}
diff --git a/src/main/java/com/zcloud/service/safetyMeeting/impl/SafetyMeetingServiceImpl.java b/src/main/java/com/zcloud/service/safetyMeeting/impl/SafetyMeetingServiceImpl.java
new file mode 100644
index 0000000..d5efd0e
--- /dev/null
+++ b/src/main/java/com/zcloud/service/safetyMeeting/impl/SafetyMeetingServiceImpl.java
@@ -0,0 +1,74 @@
+package com.zcloud.service.safetyMeeting.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.safetyMeeting.SafetyMeetingMapper;
+import com.zcloud.mapper.datasource.safetyMeeting.SafetyMeetingPeopleMapper;
+import com.zcloud.service.safetyMeeting.SafetyMeetingService;
+import com.zcloud.util.InitPageDataUtil;
+import com.zcloud.util.Jurisdiction;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional
+public class SafetyMeetingServiceImpl implements SafetyMeetingService {
+
+    @Resource
+    private SafetyMeetingMapper safetyMeetingMapper;
+    @Resource
+    private SafetyMeetingPeopleMapper safetyMeetingPeopleMapper;
+    @Resource
+    private InitPageDataUtil initPageDataUtil;
+
+    @Override
+    public void save(PageData pageData) {
+        List<PageData> dataList = JSON.parseArray(pageData.getString("people"), PageData.class);
+        List<PageData> safetyMeetingPeopledataList = new ArrayList<>();
+        dataList.forEach(item ->{
+            String[] userIds = item.getString("USER_ID").split(",");
+            for (String userId : userIds) {
+                PageData safetyMeetingPeopledata = new PageData();
+                safetyMeetingPeopledata.put("SAFETY_MEETING_ID",pageData.getString("SAFETY_MEETING_ID"));
+                safetyMeetingPeopledata.put("SIGNATORY",userId);
+                safetyMeetingPeopledata.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+                initPageDataUtil.initSave(safetyMeetingPeopledata,"SAFETY_MEETING_PEOPLE_ID");
+                safetyMeetingPeopledataList.add(safetyMeetingPeopledata);
+            }
+        });
+        pageData.put("ALL_SIGNATURES",dataList.size());
+        pageData.put("SIGNATURES",0);
+        safetyMeetingMapper.save(pageData);
+        safetyMeetingPeopleMapper.saveBatch(safetyMeetingPeopledataList);
+    }
+
+    @Override
+    public void removeById(PageData pageData) {
+        safetyMeetingMapper.removeById(pageData);
+    }
+
+    @Override
+    public List<PageData> list(Page page) {
+        return safetyMeetingMapper.datalistPage(page);
+    }
+
+    @Override
+    public PageData findById(PageData pageData) {
+        return safetyMeetingMapper.findById(pageData);
+    }
+
+    @Override
+    public void edit(PageData pageData) {
+        safetyMeetingMapper.edit(pageData);
+    }
+}
diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java
index 95491df..bb24e34 100644
--- a/src/main/java/com/zcloud/service/system/DepartmentService.java
+++ b/src/main/java/com/zcloud/service/system/DepartmentService.java
@@ -5,6 +5,7 @@ import com.zcloud.entity.PageData;
 import com.zcloud.entity.system.Department;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 说明： 组织机构接接口
@@ -218,5 +219,7 @@ public interface DepartmentService{
 	 * @throws Exception
 	 */
 	public List<PageData> saftpersonlist(PageData pd) throws Exception;
+
+	List<Map<String, Object>> getDeptAllByCorp(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java
index 4d09ed7..9896f78 100644
--- a/src/main/java/com/zcloud/service/system/UsersService.java
+++ b/src/main/java/com/zcloud/service/system/UsersService.java
@@ -7,6 +7,7 @@ import com.zcloud.util.ReturnMap;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 说明：用户服务接口
@@ -303,4 +304,5 @@ public interface UsersService {
 	 * @Return: com.zcloud.entity.PageData
 	 */
 	PageData getUserByCardNo(PageData pageData);
+
 }
diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
index 12798c7..cc2f93f 100644
--- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
@@ -414,6 +414,12 @@ public class DepartmentServiceImpl implements DepartmentService {
 		return departmentMapper.saftpersonlist(pd);
 	}
 
+	@Override
+	public List<Map<String, Object>> getDeptAllByCorp(PageData pd) {
+		return departmentMapper.getDeptAllByCorp(pd);
+
+	}
+
 	public List<Department> listAllDigui(String parentId, Map<String,List<Department>> allList,String url) throws Exception {
 		List<Department> itemList = this.listSubMenuByParentId(parentId,allList);  //更具pid 获取数据
 		for(Department depar : itemList){
diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
index d55919e..9f58f2b 100644
--- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
@@ -14,7 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -282,6 +284,9 @@ public class UsersServiceImpl implements UsersService {
         return usersMapper.getUserByCardNo(pageData);
     }
 
+
+
+
     @Override
     public ReturnMap saveUserNew(PageData pd) throws Exception {
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
diff --git a/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml
new file mode 100644
index 0000000..501f053
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.safetyMeeting.SafetyMeetingMapper">
+
+    <!--表名 -->
+    <sql id="tableName">
+        SAFETY_MEETING
+    </sql>
+    <!-- 字段 -->
+    <sql id="Field">
+        f
+        .
+        SAFETY_MEETING_ID
+        ,
+		f.SAFETY_MEETING_TITLE,
+		f.SAFETY_MEETING_CONTENT,
+		f.SIGNATURES,
+		f.ALL_SIGNATURES,
+		f.CORPINFO_ID,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE
+    </sql>
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        SAFETY_MEETING_ID
+        ,
+		SAFETY_MEETING_TITLE,
+		SAFETY_MEETING_CONTENT,
+		SIGNATURES,
+		ALL_SIGNATURES,
+		CORPINFO_ID,
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{SAFETY_MEETING_ID}
+        ,
+        #{SAFETY_MEETING_TITLE},
+        #{SAFETY_MEETING_CONTENT},
+        #{SIGNATURES},
+        #{ALL_SIGNATURES},
+        #{CORPINFO_ID},
+        #{CREATOR},
+        #{CREATTIME},
+        #{OPERATOR},
+        #{OPERATTIME},
+        #{ISDELETE}
+    </sql>
+    <insert id="save">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field2"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
+
+    <update id="removeById">
+        update
+        <include refid="tableName"></include>
+        set
+        ISDELETE = '1',
+        OPERATOR=#{OPERATOR},
+        OPERATTIME=#{OPERATTIME}
+        where
+        SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+    </update>
+    <update id="edit">
+        update
+        <include refid="tableName"></include>
+        set
+        SAFETY_MEETING_TITLE=#{SAFETY_MEETING_TITLE},
+        SAFETY_MEETING_CONTENT=#{SAFETY_MEETING_CONTENT},
+        SIGNATURES=#{SIGNATURES},
+        ALL_SIGNATURES=#{ALL_SIGNATURES},
+        CORPINFO_ID=#{CORPINFO_ID},
+        CREATOR=#{CREATOR},
+        CREATTIME=#{CREATTIME},
+        OPERATOR=#{OPERATOR},
+        OPERATTIME=#{OPERATTIME}
+        where
+        SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+    </update>
+    <select id="datalistPage" resultType="com.zcloud.entity.PageData">
+        select * from <include refid="tableName"></include> where ISDELETE = '0' and CORPINFO_ID = #{pd.CORPINFO_ID}
+        <if test="pd.SAFETY_MEETING_TITLE != null and pd.SAFETY_MEETING_TITLE != ''">
+            and SAFETY_MEETING_TITLE like '%${pd.SAFETY_MEETING_TITLE}%'
+        </if>
+    </select>
+    <select id="findById" resultType="com.zcloud.entity.PageData">
+        select * from <include refid="tableName"></include> where ISDELETE = '0'
+            and SAFETY_MEETING_ID = #{SAFETY_MEETING_ID}
+    </select>
+
+
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingPeopleMapper.xml b/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingPeopleMapper.xml
new file mode 100644
index 0000000..750416d
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingPeopleMapper.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.safetyMeeting.SafetyMeetingPeopleMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		SAFETY_MEETING_PEOPLE
+	</sql>
+
+	<!--数据字典表名 -->
+	<sql id="dicTableName">
+		SYS_DICTIONARIES
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.SAFETY_MEETING_PEOPLE_ID,
+		f.SAFETY_MEETING_ID,
+		f.SIGNATORY,
+		f.FEED_BACK,
+		f.CORPINFO_ID,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		SAFETY_MEETING_PEOPLE_ID,
+		SAFETY_MEETING_ID,
+		SIGNATORY,
+		FEED_BACK,
+		CORPINFO_ID,
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{SAFETY_MEETING_PEOPLE_ID},
+		#{SAFETY_MEETING_ID},
+		#{SIGNATORY},
+		#{FEED_BACK},
+		#{CORPINFO_ID},
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{ISDELETE}
+	</sql>
+	<sql id="FieldValue2">
+		#{item.SAFETY_MEETING_PEOPLE_ID},
+		#{item.SAFETY_MEETING_ID},
+		#{item.SIGNATORY},
+		#{item.FEED_BACK},
+		#{item.CORPINFO_ID},
+		#{item.CREATOR},
+		#{item.CREATTIME},
+		#{item.OPERATOR},
+		#{item.OPERATTIME},
+		#{item.ISDELETE}
+	</sql>
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+	<insert id="saveBatch">
+		insert into <include refid="tableName"></include>
+		(<include refid="Field2"></include>) values
+		<foreach item="item" index="index" collection="list" separator="," >
+			(<include refid="FieldValue2"></include>)
+		</foreach>
+	</insert>
+
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
index 9fd023c..dd16b30 100644
--- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
@@ -2,20 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zcloud.mapper.datasource.system.DepartmentMapper">
 
-	<resultMap type="Department" id="departmentResultMap">
-		<id column="DEPARTMENT_ID" property="DEPARTMENT_ID"/>
-		<result column="NAME" property="NAME"/>
-		<result column="PARENT_ID" property="PARENT_ID"/>
-	</resultMap>
+    <resultMap type="Department" id="departmentResultMap">
+        <id column="DEPARTMENT_ID" property="DEPARTMENT_ID"/>
+        <result column="NAME" property="NAME"/>
+        <result column="PARENT_ID" property="PARENT_ID"/>
+    </resultMap>
 
-	<!--表名 -->
-	<sql id="tableName">
-		OA_DEPARTMENT
-	</sql>
+    <!--表名 -->
+    <sql id="tableName">
+        OA_DEPARTMENT
+    </sql>
 
-	<!-- 字段 -->
-	<sql id="Field">
-		NAME,
+    <!-- 字段 -->
+    <sql id="Field">
+        NAME
+        ,
 		NAME_EN,
 		BIANMA,
 		PARENT_ID,
@@ -29,534 +30,555 @@
 		LEVEL,
 		DEP_ORDER,
 		ISSUPERVISE,
-		ISDELETE
+		ISDELETE,
 		LEADER_CHARGE,
 		STATE,
 		checkedIds,
 		DJBM
-	</sql>
+    </sql>
 
-	<!-- 字段值 -->
-	<sql id="FieldValue">
-		#{NAME},
-		#{NAME_EN},
-		#{BIANMA},
-		#{PARENT_ID},
-		#{HEADMAN},
-		#{TEL},
-		#{FUNCTIONS},
-		#{ADDRESS},
-		#{BZ},
-		#{DEPARTMENT_ID},
-		#{CORPINFO_ID},
-		#{LEVEL},
-		#{DEP_ORDER},
-		#{ISSUPERVISE},
-		0
-		#{LEADER_CHARGE},
-		#{STATE},
-		#{checkedIds},
-		#{DJBM},
-	</sql>
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{NAME}
+        ,
+        #{NAME_EN},
+        #{BIANMA},
+        #{PARENT_ID},
+        #{HEADMAN},
+        #{TEL},
+        #{FUNCTIONS},
+        #{ADDRESS},
+        #{BZ},
+        #{DEPARTMENT_ID},
+        #{CORPINFO_ID},
+        #{LEVEL},
+        #{DEP_ORDER},
+        #{ISSUPERVISE},
+        0,
+        #{LEADER_CHARGE},
+        #{STATE},
+        #{checkedIds},
+        #{DJBM}
+    </sql>
 
-	<!-- 新增-->
-	<insert id="save" parameterType="pd">
-		insert into
-	<include refid="tableName"></include>
-		(
-	<include refid="Field"></include>
-		) values (
-	<include refid="FieldValue"></include>
-		)
-	</insert>
+    <!-- 新增-->
+    <insert id="save" parameterType="pd">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
 
-	<!-- 删除-->
-	<update id="delete" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set ISDELETE = 1
-		where
-			DEPARTMENT_ID = #{DEPARTMENT_ID}
-	</update>
+    <!-- 删除-->
+    <update id="delete" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set ISDELETE = 1
+        where
+        DEPARTMENT_ID = #{DEPARTMENT_ID}
+    </update>
 
-	<!-- 修改 -->
-	<update id="edit" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			NAME = #{NAME},
-			NAME_EN = #{NAME_EN},
-			HEADMAN = #{HEADMAN},
-			BZ = #{BZ},
-			TEL = #{TEL},
-			FUNCTIONS = #{FUNCTIONS},
-			ADDRESS = #{ADDRESS},
-			LEVEL = #{LEVEL},
-			DEPARTMENT_ID = DEPARTMENT_ID,
-			DEP_ORDER = #{DEP_ORDER},
-			ISSUPERVISE = #{ISSUPERVISE}
-			LEADER_CHARGE = #{LEADER_CHARGE},
-			STATE = #{STATE},
-			checkedIds = #{checkedIds},
-			DJBM = #{DJBM}
-		where ISDELETE = 0 and
-		DEPARTMENT_ID = #{DEPARTMENT_ID}
-	</update>
+    <!-- 修改 -->
+    <update id="edit" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        NAME = #{NAME},
+        NAME_EN = #{NAME_EN},
+        HEADMAN = #{HEADMAN},
+        BZ = #{BZ},
+        TEL = #{TEL},
+        FUNCTIONS = #{FUNCTIONS},
+        ADDRESS = #{ADDRESS},
+        LEVEL = #{LEVEL},
+        DEPARTMENT_ID = DEPARTMENT_ID,
+        DEP_ORDER = #{DEP_ORDER},
+        ISSUPERVISE = #{ISSUPERVISE}
+        LEADER_CHARGE = #{LEADER_CHARGE},
+        STATE = #{STATE},
+        checkedIds = #{checkedIds},
+        DJBM = #{DJBM}
+        where ISDELETE = 0 and
+        DEPARTMENT_ID = #{DEPARTMENT_ID}
+    </update>
 
-	<select id="saftmanagelist" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include>
-		where 1=1
-		and CORPINFO_ID  = #{CORPINFO_ID}
-		and STATE = #{STATE}
-	</select>
+    <select id="saftmanagelist" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        where 1=1
+        and CORPINFO_ID = #{CORPINFO_ID}
+        and STATE = #{STATE}
+    </select>
 
-	<!-- 导出全部数据 -->
-	<select id="islistAll" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		select
-		f.NAME,u1.name as HEADMAN_NAME,s.name as leName
-		from
-		<include refid="tableName"></include>f
-		LEFT JOIN SYS_DICTIONARIES s on s.BIANMA = f.LEVEL
-		LEFT JOIN sys_user u1 on u1.USER_ID = f.HEADMAN
-		where 1=1
-		<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
-			AND
-			f.CORPINFO_ID = #{CORPINFO_ID}
-		</if>
-		order by f.LEVEL ,f.DEP_ORDER asc
-	</select>
-	<!-- 向下递归查询企业部门（集团部门+子公司部门） -->
-	<select id="Dept" parameterType="page" resultType="com.zcloud.entity.PageData">
-		SELECT
-		f.DEPARTMENT_ID,
-		f.PARENT_ID,
-		f.NAME DEPT_NAME,
-		COUNT(c.DEPARTMENT_ID) NEXTCOUNT
-		FROM OA_DEPARTMENT f
-		LEFT JOIN OA_DEPARTMENT c ON c.PARENT_ID = f.DEPARTMENT_ID
-		WHERE 1 = 1 and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
-			AND f.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
-		</if>
-		<if test="pd.PARENT_ID != null and pd.PARENT_ID != ''">
-			AND f.PARENT_ID = #{pd.PARENT_ID}
-		</if>
-		GROUP BY f.DEPARTMENT_ID
-		ORDER BY f.DEP_ORDER ASC
-	</select>
+    <!-- 导出全部数据 -->
+    <select id="islistAll" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        select
+        f.NAME,u1.name as HEADMAN_NAME,s.name as leName
+        from
+        <include refid="tableName"></include>f
+        LEFT JOIN SYS_DICTIONARIES s on s.BIANMA = f.LEVEL
+        LEFT JOIN sys_user u1 on u1.USER_ID = f.HEADMAN
+        where 1=1
+        <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
+            AND
+            f.CORPINFO_ID = #{CORPINFO_ID}
+        </if>
+        order by f.LEVEL ,f.DEP_ORDER asc
+    </select>
+    <!-- 向下递归查询企业部门（集团部门+子公司部门） -->
+    <select id="Dept" parameterType="page" resultType="com.zcloud.entity.PageData">
+        SELECT
+        f.DEPARTMENT_ID,
+        f.PARENT_ID,
+        f.NAME DEPT_NAME,
+        COUNT(c.DEPARTMENT_ID) NEXTCOUNT
+        FROM OA_DEPARTMENT f
+        LEFT JOIN OA_DEPARTMENT c ON c.PARENT_ID = f.DEPARTMENT_ID
+        WHERE 1 = 1 and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+            AND f.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+        </if>
+        <if test="pd.PARENT_ID != null and pd.PARENT_ID != ''">
+            AND f.PARENT_ID = #{pd.PARENT_ID}
+        </if>
+        GROUP BY f.DEPARTMENT_ID
+        ORDER BY f.DEP_ORDER ASC
+    </select>
 
-	<!-- 通过ID获取数据 -->
-	<select id="findById" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>,
-		(select NAME from OA_DEPARTMENT o where t.PARENT_ID=o.DEPARTMENT_ID) as PARENT_NAME
-		from
-		<include refid="tableName"></include> t
-		where
-			DEPARTMENT_ID = #{DEPARTMENT_ID}
-	</select>
-	<select id="findByName" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include> t ,
-		(select NAME from OA_DEPARTMENT o where t.PARENT_ID=o.DEPARTMENT_ID) as PARENT_NAME
-		from
-		<include refid="tableName"></include> t
-		where t.ISDELETE = 0 and
-		t.NAME = #{NAME} and t.CORPINFO_ID = #{CORPINFO_ID}
-			<if test="PARENT_ID != null and PARENT_ID != ''">
-				AND 	t.PARENT_ID = #{PARENT_ID}
-			</if>
-			<if test="ISEDIT != null and ISEDIT != ''">
-				AND 	t.DEPARTMENT_ID != #{DEPARTMENT_ID}
-			</if>
-	</select>
+    <!-- 通过ID获取数据 -->
+    <select id="findById" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>,
+        (select NAME from OA_DEPARTMENT o where t.PARENT_ID=o.DEPARTMENT_ID) as PARENT_NAME
+        from
+        <include refid="tableName"></include>
+        t
+        where
+        DEPARTMENT_ID = #{DEPARTMENT_ID}
+    </select>
+    <select id="findByName" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>
+        t ,
+        (select NAME from OA_DEPARTMENT o where t.PARENT_ID=o.DEPARTMENT_ID) as PARENT_NAME
+        from
+        <include refid="tableName"></include>
+        t
+        where t.ISDELETE = 0 and
+        t.NAME = #{NAME} and t.CORPINFO_ID = #{CORPINFO_ID}
+        <if test="PARENT_ID != null and PARENT_ID != ''">
+            AND t.PARENT_ID = #{PARENT_ID}
+        </if>
+        <if test="ISEDIT != null and ISEDIT != ''">
+            AND t.DEPARTMENT_ID != #{DEPARTMENT_ID}
+        </if>
+    </select>
 
-	<!--通过条件获取全部 -->
-	<select id="findByCorpId" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where f.ISDELETE = 0 and
-		f.CORPINFO_ID = #{CORPINFO_ID} and f.PARENT_ID='0'
-	</select>
+    <!--通过条件获取全部 -->
+    <select id="findByCorpId" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        f
+        where f.ISDELETE = 0 and
+        f.CORPINFO_ID = #{CORPINFO_ID} and f.PARENT_ID='0'
+    </select>
 
-	<!-- 通过编码获取数据 -->
-	<select id="findByBianma" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include>
-		where
-			BIANMA = #{BIANMA}
-	</select>
+    <!-- 通过编码获取数据 -->
+    <select id="findByBianma" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        where
+        BIANMA = #{BIANMA}
+    </select>
 
-	<!-- 列表 -->
-	<select id="datalistPage" parameterType="page" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include>
-		where
-		ISDELETE = 0
-		<if test="pd.DEPARTMENT_ID!= null and pd.DEPARTMENT_ID != ''"><!-- 检索 -->
-		and PARENT_ID = #{pd.DEPARTMENT_ID}
-		</if>
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
-			AND
-				CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
+    <!-- 列表 -->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        where
+        ISDELETE = 0
+        <if test="pd.DEPARTMENT_ID!= null and pd.DEPARTMENT_ID != ''"><!-- 检索 -->
+            and PARENT_ID = #{pd.DEPARTMENT_ID}
+        </if>
+        <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
+            AND
+            CORPINFO_ID = #{pd.CORPINFO_ID}
+        </if>
 
-		<if test="pd.keywords != null and pd.keywords != ''"><!-- 关键词检索 -->
-			and
-				(
-				 NAME LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-				 or
-				 NAME_EN LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-				 or
-				 BIANMA LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-				)
-		</if>
-		order by DEP_ORDER asc , NAME
-	</select>
+        <if test="pd.keywords != null and pd.keywords != ''"><!-- 关键词检索 -->
+            and
+            (
+            NAME LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+            or
+            NAME_EN LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+            or
+            BIANMA LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+            )
+        </if>
+        order by DEP_ORDER asc , NAME
+    </select>
 
-	<!-- 通过ID获取其子级列表 -->
-	<select id="listSubDepartmentByParentId" parameterType="String" resultMap="departmentResultMap">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include>
-		where ISDELETE = 0
-		<if test="_parameter  != null and _parameter  != ''"><!-- 关键词检索 -->
-			and PARENT_ID = #{parentId}
-		</if>
+    <!-- 通过ID获取其子级列表 -->
+    <select id="listSubDepartmentByParentId" parameterType="String" resultMap="departmentResultMap">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        where ISDELETE = 0
+        <if test="_parameter  != null and _parameter  != ''"><!-- 关键词检索 -->
+            and PARENT_ID = #{parentId}
+        </if>
 
-		order by DEP_ORDER asc, NAME
-	</select>
+        order by DEP_ORDER asc, NAME
+    </select>
 
 
-	<!-- 通过ID获取其子级列表 -->
-	<select id="listSubDepByParentId" parameterType="pd" resultMap="departmentResultMap">
-		select
-		f.*,
-		IF(o.SUPERVISIONDEPARTMENT_ID is not null,'false','true') DISABLED
+    <!-- 通过ID获取其子级列表 -->
+    <select id="listSubDepByParentId" parameterType="pd" resultMap="departmentResultMap">
+        select
+        f.*,
+        IF(o.SUPERVISIONDEPARTMENT_ID is not null,'false','true') DISABLED
 
-		from
-		<include refid="tableName"></include> f
-		left join oa_supervision_department o on f.DEPARTMENT_ID = o.SUB_DEPARTMENT_ID AND o.SUP_DEPARTMENT_ID = #{SUP_DEPARTMENT_ID} and o.isdelete= '0'
+        from
+        <include refid="tableName"></include>
+        f
+        left join oa_supervision_department o on f.DEPARTMENT_ID = o.SUB_DEPARTMENT_ID AND o.SUP_DEPARTMENT_ID =
+        #{SUP_DEPARTMENT_ID} and o.isdelete= '0'
 
-		where f.ISDELETE = 0
+        where f.ISDELETE = 0
 
-		<if test="parentId  != null and parentId  != ''"><!-- 关键词检索 -->
-			and f.PARENT_ID = #{parentId}
-		</if>
-		order by f.DEP_ORDER asc, f.NAME
-	</select>
+        <if test="parentId  != null and parentId  != ''"><!-- 关键词检索 -->
+            and f.PARENT_ID = #{parentId}
+        </if>
+        order by f.DEP_ORDER asc, f.NAME
+    </select>
 
-	<!-- 通过ID获取其子级列表 -->
-	<select id="listAll" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include>
-		where ISDELETE = 0
-		<if test="parameter  != null and parameter  != ''"><!-- 关键词检索 -->
-			and PARENT_ID = #{parameter}
-		</if>
-		<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
-			AND
-				CORPINFO_ID = #{CORPINFO_ID}
-		</if>
-		<if test="PARENT_ID != null and PARENT_ID != ''"><!-- 关键词检索 -->
-			AND
-				PARENT_ID = #{PARENT_ID}
-		</if>
-		order by DEP_ORDER asc ,NAME
-	</select>
+    <!-- 通过ID获取其子级列表 -->
+    <select id="listAll" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        where ISDELETE = 0
+        <if test="parameter  != null and parameter  != ''"><!-- 关键词检索 -->
+            and PARENT_ID = #{parameter}
+        </if>
+        <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
+            AND
+            CORPINFO_ID = #{CORPINFO_ID}
+        </if>
+        <if test="PARENT_ID != null and PARENT_ID != ''"><!-- 关键词检索 -->
+            AND
+            PARENT_ID = #{PARENT_ID}
+        </if>
+        order by DEP_ORDER asc ,NAME
+    </select>
 
-		<!-- 列表关联部门级别 -->
-	<select id="forLevelNamedatalistPage" parameterType="page" resultType="pd">
-		select
-		f.NAME,
-		f.NAME_EN,
-		getFullName(f.DEPARTMENT_ID) DEPARTMENTNAME_ALL,
-		f.BIANMA,
-		f.PARENT_ID,
-		f.HEADMAN,
-		f.TEL,
-		f.FUNCTIONS,
-		f.ADDRESS,
-		f.BZ,
-		f.DEPARTMENT_ID,
-		f.CORPINFO_ID,
-		f.LEVEL,
-		f.ISSUPERVISE,
-		f.LEADER_CHARGE,
-		f.STATE,
-		f.checkedIds,
-		f.DJBM,
-		s.name as leName,
-		f.DEP_ORDER
-		from  OA_DEPARTMENT f
-		LEFT JOIN SYS_DICTIONARIES s on s.BIANMA = f.LEVEL
-		where
-			f.ISDELETE = 0
-		<if test="pd.keywords != null and pd.keywords != ''"><!-- 关键词检索 -->
-			and
-			(
-			f.NAME LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-			or
-			f.NAME_EN LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-			or
-			f.BIANMA LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-			)
-		</if>
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
-			AND
-				f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
-		<if test="pd.LEVEL != null and pd.LEVEL != ''"><!-- 关键词检索 -->
-			AND
-			f.LEVEL = #{pd.LEVEL}
-		</if>
-		<if test="pd.DEPARTMENT_ID!= null and pd.DEPARTMENT_ID != ''"><!-- 检索 -->
-			and f.PARENT_ID = #{pd.DEPARTMENT_ID}
-		</if>
-<!--		<if test="pd.SELECT_DEPARTMENT_ID != null and pd.SELECT_DEPARTMENT_ID != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;-->
-<!--			AND-->
-<!--				 (f.PARENT_ID = #{pd.SELECT_DEPARTMENT_ID} or f.DEPARTMENT_ID = #{pd.SELECT_DEPARTMENT_ID})-->
-<!--		</if>-->
+    <!-- 列表关联部门级别 -->
+    <select id="forLevelNamedatalistPage" parameterType="page" resultType="pd">
+        select
+        f.NAME,
+        f.NAME_EN,
+        getFullName(f.DEPARTMENT_ID) DEPARTMENTNAME_ALL,
+        f.BIANMA,
+        f.PARENT_ID,
+        f.HEADMAN,
+        f.TEL,
+        f.FUNCTIONS,
+        f.ADDRESS,
+        f.BZ,
+        f.DEPARTMENT_ID,
+        f.CORPINFO_ID,
+        f.LEVEL,
+        f.ISSUPERVISE,
+        f.LEADER_CHARGE,
+        f.STATE,
+        f.checkedIds,
+        f.DJBM,
+        s.name as leName,
+        f.DEP_ORDER
+        from OA_DEPARTMENT f
+        LEFT JOIN SYS_DICTIONARIES s on s.BIANMA = f.LEVEL
+        where
+        f.ISDELETE = 0
+        <if test="pd.keywords != null and pd.keywords != ''"><!-- 关键词检索 -->
+            and
+            (
+            f.NAME LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+            or
+            f.NAME_EN LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+            or
+            f.BIANMA LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+            )
+        </if>
+        <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
+            AND
+            f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        </if>
+        <if test="pd.LEVEL != null and pd.LEVEL != ''"><!-- 关键词检索 -->
+            AND
+            f.LEVEL = #{pd.LEVEL}
+        </if>
+        <if test="pd.DEPARTMENT_ID!= null and pd.DEPARTMENT_ID != ''"><!-- 检索 -->
+            and f.PARENT_ID = #{pd.DEPARTMENT_ID}
+        </if>
+        <!--		<if test="pd.SELECT_DEPARTMENT_ID != null and pd.SELECT_DEPARTMENT_ID != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;-->
+        <!--			AND-->
+        <!--				 (f.PARENT_ID = #{pd.SELECT_DEPARTMENT_ID} or f.DEPARTMENT_ID = #{pd.SELECT_DEPARTMENT_ID})-->
+        <!--		</if>-->
 
-		<choose>
-			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
-				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-					and
-					f.DEPARTMENT_ID in
-					<foreach item="item" index="index"
-							 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-						'${item}'
-					</foreach>
-				</if>
-			</when>
-			<otherwise>
-				<choose>
-					<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
-						<choose>
-							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-								and
-								f.DEPARTMENT_ID in
-								<foreach item="item" index="index"
-										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-									'${item}'
-								</foreach>
-							</when>
-							<otherwise>
-								and
-								f.DEPARTMENT_ID in (
-								select
-								SUB_DEPARTMENT_ID
-								from
-								oa_supervision_department osd
-								where
-								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
-								and osd.ISDELETE = '0'
-								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
-								)
-							</otherwise>
-						</choose>
-					</when>
-					<when test="pd.DEPARTMENT_ID == '' and pd.SELECT_DEPARTMENT_ID != null and pd.SELECT_DEPARTMENT_ID != ''">
-						and (f.PARENT_ID = #{pd.SELECT_DEPARTMENT_ID} or f.DEPARTMENT_ID = #{pd.SELECT_DEPARTMENT_ID})
-					</when>
-					<otherwise>
-					</otherwise>
-				</choose>
-			</otherwise>
-		</choose>
-		order by DEP_ORDER asc ,NAME
-	</select>
+        <choose>
+            <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+                <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                    and
+                    f.DEPARTMENT_ID in
+                    <foreach item="item" index="index"
+                             collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                        '${item}'
+                    </foreach>
+                </if>
+            </when>
+            <otherwise>
+                <choose>
+                    <when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+                        <choose>
+                            <when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                                and
+                                f.DEPARTMENT_ID in
+                                <foreach item="item" index="index"
+                                         collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                                    '${item}'
+                                </foreach>
+                            </when>
+                            <otherwise>
+                                and
+                                f.DEPARTMENT_ID in (
+                                select
+                                SUB_DEPARTMENT_ID
+                                from
+                                oa_supervision_department osd
+                                where
+                                osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+                                and osd.ISDELETE = '0'
+                                and osd.CORPINFO_ID = #{pd.CORPINFO_ID}
+                                )
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="pd.DEPARTMENT_ID == '' and pd.SELECT_DEPARTMENT_ID != null and pd.SELECT_DEPARTMENT_ID != ''">
+                        and (f.PARENT_ID = #{pd.SELECT_DEPARTMENT_ID} or f.DEPARTMENT_ID = #{pd.SELECT_DEPARTMENT_ID})
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </otherwise>
+        </choose>
+        order by DEP_ORDER asc ,NAME
+    </select>
 
-		<!-- 查询公司部门总数 -->
-	<select id="getDepCount" parameterType="pd" resultType="int" >
-		SELECT
-			COUNT( 1 )
-		FROM
-			oa_department
-		WHERE ISDELETE = 0 and
-			CORPINFO_ID = #{CORPINFO_ID}
-	</select>
+    <!-- 查询公司部门总数 -->
+    <select id="getDepCount" parameterType="pd" resultType="int">
+        SELECT COUNT(1)
+        FROM oa_department
+        WHERE ISDELETE = 0
+          and CORPINFO_ID = #{CORPINFO_ID}
+    </select>
 
-	<!-- 查询公司检查过清单的部门总数 -->
-	<select id="getWorkedDepCount" parameterType="pd" resultType="int" >
-		SELECT
-			count( 1 )
-		FROM
-			(
-			SELECT
-				count( s.DEPARTMENT_ID )
-			FROM
-				oa_department s
-				LEFT JOIN bus_checkuser cu ON s.DEPARTMENT_ID = cu.DEPARTMENT_ID
-				LEFT JOIN bus_checkrecord f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID
-			WHERE
-				s.CORPINFO_ID = #{CORPINFO_ID}
-				AND s.ISDELETE = 0
-				AND f.FINISHED = '1'
-				AND f.isdelete = '0'
-				AND f.CHECKRECORD_ID IS NOT NULL
-				AND DATE_FORMAT(f.CHECK_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
-			GROUP BY
-			s.DEPARTMENT_ID
-			) q
-	</select>
+    <!-- 查询公司检查过清单的部门总数 -->
+    <select id="getWorkedDepCount" parameterType="pd" resultType="int">
+        SELECT count(1)
+        FROM (SELECT count(s.DEPARTMENT_ID)
+              FROM oa_department s
+                       LEFT JOIN bus_checkuser cu ON s.DEPARTMENT_ID = cu.DEPARTMENT_ID
+                       LEFT JOIN bus_checkrecord f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID
+              WHERE s.CORPINFO_ID = #{CORPINFO_ID}
+                AND s.ISDELETE = 0
+                AND f.FINISHED = '1'
+                AND f.isdelete = '0'
+                AND f.CHECKRECORD_ID IS NOT NULL
+                AND DATE_FORMAT(f.CHECK_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+              GROUP BY s.DEPARTMENT_ID) q
+    </select>
 
-	<select id="findBySubId" parameterType="pd" resultType="pd">
-		select
-		f.*
-		from
-		oa_supervision_department f
-		where f.ISDELETE = 0
-		<if test="SUP_DEPARTMENT_ID  != null and SUP_DEPARTMENT_ID  != ''"><!-- 关键词检索 -->
-			and f.SUP_DEPARTMENT_ID = #{SUP_DEPARTMENT_ID}
-		</if>
-	</select>
-	<!-- 向下递归查询企业部门（集团部门+子公司部门） -->
-	<select id="listDept" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-		f.DEPARTMENT_ID,
-		f.PARENT_ID,
-		f.NAME DEPT_NAME,
-		COUNT(c.DEPARTMENT_ID) NEXTCOUNT
-		FROM OA_DEPARTMENT f
-		LEFT JOIN OA_DEPARTMENT c ON c.PARENT_ID = f.DEPARTMENT_ID
-		WHERE 1 = 1
-		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
-			AND f.DEPARTMENT_ID = #{DEPARTMENT_ID}
-		</if>
-		<if test="PARENT_ID != null and PARENT_ID != ''">
-			AND f.PARENT_ID = #{PARENT_ID}
-		</if>
-		group by f.DEPARTMENT_ID
-		ORDER BY f.DEP_ORDER ASC
-	</select>
+    <select id="findBySubId" parameterType="pd" resultType="pd">
+        select
+        f.*
+        from
+        oa_supervision_department f
+        where f.ISDELETE = 0
+        <if test="SUP_DEPARTMENT_ID  != null and SUP_DEPARTMENT_ID  != ''"><!-- 关键词检索 -->
+            and f.SUP_DEPARTMENT_ID = #{SUP_DEPARTMENT_ID}
+        </if>
+    </select>
+    <!-- 向下递归查询企业部门（集团部门+子公司部门） -->
+    <select id="listDept" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT
+        f.DEPARTMENT_ID,
+        f.PARENT_ID,
+        f.NAME DEPT_NAME,
+        COUNT(c.DEPARTMENT_ID) NEXTCOUNT
+        FROM OA_DEPARTMENT f
+        LEFT JOIN OA_DEPARTMENT c ON c.PARENT_ID = f.DEPARTMENT_ID
+        WHERE 1 = 1
+        <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
+            AND f.DEPARTMENT_ID = #{DEPARTMENT_ID}
+        </if>
+        <if test="PARENT_ID != null and PARENT_ID != ''">
+            AND f.PARENT_ID = #{PARENT_ID}
+        </if>
+        group by f.DEPARTMENT_ID
+        ORDER BY f.DEP_ORDER ASC
+    </select>
 
-	<select id="getSonIdsByParid" parameterType="pd" resultType="pd">
-		SELECT
-		f.DEPARTMENT_ID,
-		f.`NAME` as DEPT_NAME,
-		queryRecursiveDeptDown ( f.DEPARTMENT_ID ) as ids
-		FROM
-		oa_department f
-		LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = f.CORPINFO_ID
-		WHERE
-		c.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
-		<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
-			AND f.DEPARTMENT_ID = #{DEPARTMENT_ID}
-		</if>
-		<if test="PARENT_ID != null and PARENT_ID != ''">
-			AND f.PARENT_ID = #{PARENT_ID}
-		</if>
-		ORDER BY f.DEP_ORDER ASC
-	</select>
+    <select id="getSonIdsByParid" parameterType="pd" resultType="pd">
+        SELECT
+        f.DEPARTMENT_ID,
+        f.`NAME` as DEPT_NAME,
+        queryRecursiveDeptDown ( f.DEPARTMENT_ID ) as ids
+        FROM
+        oa_department f
+        LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = f.CORPINFO_ID
+        WHERE
+        c.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID}
+        <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
+            AND f.DEPARTMENT_ID = #{DEPARTMENT_ID}
+        </if>
+        <if test="PARENT_ID != null and PARENT_ID != ''">
+            AND f.PARENT_ID = #{PARENT_ID}
+        </if>
+        ORDER BY f.DEP_ORDER ASC
+    </select>
 
-	<!-- 向下递归查询企业部门（只查企业端部门表集团部门） -->
-	<select id="listTreeManageAndCorp2" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-		DEPARTMENT_ID id,
-		NAME name,
-		PARENT_ID pId
-		FROM <include refid="tableName"></include> f
-	</select>
+    <!-- 向下递归查询企业部门（只查企业端部门表集团部门） -->
+    <select id="listTreeManageAndCorp2" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT
+        DEPARTMENT_ID id,
+        NAME name,
+        PARENT_ID pId
+        FROM <include refid="tableName"></include> f
+    </select>
 
-	<select id="listTreeManageAndCorpNum" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-		DEPARTMENT_ID id,
-		NAME name,
-		PARENT_ID pId
-		FROM <include refid="tableName"></include> f
-		where 1=1
-		<if test="corpId != null and corpId.size()>0"><!-- 关键词检索 -->
-			and f.CORPINFO_ID in
-			<foreach collection="corpId" index="index" item="item"   open="(" separator="," close=")">
-				#{corpId[${index}]}
-			</foreach>
-		</if>
-	</select>
+    <select id="listTreeManageAndCorpNum" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT
+        DEPARTMENT_ID id,
+        NAME name,
+        PARENT_ID pId
+        FROM <include refid="tableName"></include> f
+        where 1=1
+        <if test="corpId != null and corpId.size()>0"><!-- 关键词检索 -->
+            and f.CORPINFO_ID in
+            <foreach collection="corpId" index="index" item="item" open="(" separator="," close=")">
+                #{corpId[${index}]}
+            </foreach>
+        </if>
+    </select>
 
-	<!-- 向下递归查询企业部门 -->
-	<select id="listTreeCorpDept" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-		DEPARTMENT_ID id,
-		NAME name,
-		PARENT_ID pId
-		FROM <include refid="tableName"></include> f
-		WHERE f.CORPINFO_ID = #{CORPINFO_ID}
-		order by f.DEP_ORDER ASC ,f.NAME ASC
-	</select>
-	<!-- 向下递归查询企业部门 -->
-	<select id="listForDoor" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-		f.DEPARTMENT_ID,
-		NAME
-		FROM <include refid="tableName"></include> f
-		LEFT JOIN sys_user_examine e on e.DEPARTMENT_ID = f.DEPARTMENT_ID
-		WHERE f.CORPINFO_ID = #{CORPINFO_ID}
-		<if test="FIELD_ITEM!= null and FIELD_ITEM != ''"><!-- 负责人 -->
-			and e.${FIELD_ITEM} = '1'
-		</if>
-		GROUP BY f.DEPARTMENT_ID
-		order by f.DEP_ORDER ASC ,f.NAME ASC
-	</select>
-	<select id="listDepartAllByCorpinfoId" parameterType="String" resultMap="departmentResultMap">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include>
-		where 1=1
-		AND  CORPINFO_ID = #{CORPINFO_ID}
-		order by DEP_ORDER asc, NAME
-	</select>
-	<!-- 向下递归查询企业部门（只查监管端部门表集团部门） -->
-	<select id="listTreeManageAndCorp1" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-			DEPARTMENT_ID id,
-			NAME name,
-			PARENT_ID pId
-		FROM `qa-gwj-regulatory`.sys_department f
-		WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
-	</select>
-	<!-- 向下递归查询企业部门（集团部门+子公司部门） -->
-	<select id="listTreeManageAndCorpForPcPunishThePerson" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		SELECT
-		DEPARTMENT_ID id,
-		NAME name,
-		PARENT_ID pId
-		FROM `qa-gwj-regulatory`.sys_department f
-		WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
-		UNION ALL
-		SELECT
-		DEPARTMENT_ID id,
-		NAME name,
-		PARENT_ID pId
-		FROM <include refid="tableName"></include> f
-		<if test=" ids != null">
-			<foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
-				<if test=" item != null and item != ''">
-					CORPINFO_ID like CONCAT(CONCAT('%', #{item}),'%')
-				</if>
-			</foreach>
-		</if>
-	</select>
+    <!-- 向下递归查询企业部门 -->
+    <select id="listTreeCorpDept" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT
+        DEPARTMENT_ID id,
+        NAME name,
+        PARENT_ID pId
+        FROM <include refid="tableName"></include> f
+        WHERE f.CORPINFO_ID = #{CORPINFO_ID}
+        order by f.DEP_ORDER ASC ,f.NAME ASC
+    </select>
+    <!-- 向下递归查询企业部门 -->
+    <select id="listForDoor" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT
+        f.DEPARTMENT_ID,
+        NAME
+        FROM <include refid="tableName"></include> f
+        LEFT JOIN sys_user_examine e on e.DEPARTMENT_ID = f.DEPARTMENT_ID
+        WHERE f.CORPINFO_ID = #{CORPINFO_ID}
+        <if test="FIELD_ITEM!= null and FIELD_ITEM != ''"><!-- 负责人 -->
+            and e.${FIELD_ITEM} = '1'
+        </if>
+        GROUP BY f.DEPARTMENT_ID
+        order by f.DEP_ORDER ASC ,f.NAME ASC
+    </select>
+    <select id="listDepartAllByCorpinfoId" parameterType="String" resultMap="departmentResultMap">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        where 1=1
+        AND CORPINFO_ID = #{CORPINFO_ID}
+        order by DEP_ORDER asc, NAME
+    </select>
+    <!-- 向下递归查询企业部门（只查监管端部门表集团部门） -->
+    <select id="listTreeManageAndCorp1" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT DEPARTMENT_ID id,
+               NAME          name,
+               PARENT_ID     pId
+        FROM `qa-gwj-regulatory`.sys_department f
+        WHERE FIND_IN_SET(DEPARTMENT_ID, `qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
+    </select>
+    <!-- 向下递归查询企业部门（集团部门+子公司部门） -->
+    <select id="listTreeManageAndCorpForPcPunishThePerson" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        SELECT
+        DEPARTMENT_ID id,
+        NAME name,
+        PARENT_ID pId
+        FROM `qa-gwj-regulatory`.sys_department f
+        WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID}))
+        UNION ALL
+        SELECT
+        DEPARTMENT_ID id,
+        NAME name,
+        PARENT_ID pId
+        FROM <include refid="tableName"></include> f
+        <if test=" ids != null">
+            <foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
+                <if test=" item != null and item != ''">
+                    CORPINFO_ID like CONCAT(CONCAT('%', #{item}),'%')
+                </if>
+            </foreach>
+        </if>
+    </select>
 
-	<select id="saftpersonlist" parameterType="pd" resultType="com.zcloud.entity.PageData">
-		select
-			*
-		from
-			`qa-gwj-regulatory`.SYS_DEPARTMENT
-		where 1=1
-		  and STATE = '0'
-	</select>
+    <select id="saftpersonlist" parameterType="pd" resultType="com.zcloud.entity.PageData">
+        select *
+        from `qa-gwj-regulatory`.SYS_DEPARTMENT
+        where 1 = 1
+          and STATE = '0'
+    </select>
+    <select id="getDeptAllByCorp" resultType="java.util.Map">
+        select
+               name,
+               NAME_EN,
+               BIANMA,
+               PARENT_ID,
+               PARENT_ID pId,
+               HEADMAN,
+               TEL,
+               FUNCTIONS,
+               ADDRESS,
+               BZ,
+               DEPARTMENT_ID,
+               DEPARTMENT_ID id,
+               CORPINFO_ID,
+               LEVEL,
+               DEP_ORDER,
+               ISSUPERVISE,
+               ISDELETE
+               LEADER_CHARGE,
+               STATE,
+               checkedIds,
+               DJBM
+        from oa_department
+        where ISDELETE = 0
+          and CORPINFO_ID = #{CORPINFO_ID}
+    </select>
 </mapper>