From 3f1cb77842bd91dc8ec032f315808ef685eafa75 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 7 Aug 2024 11:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3xml=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=B8=8D=E5=88=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/CompanyStaffController.java         | 10 ++--
 .../entity/CompanyStaff.java                  |  2 +-
 .../mapper/CompanyStaffMapper.java            | 10 ++--
 .../service/CompanyStaffService.java          |  8 +--
 .../service/impl/CompanyStaffServiceImpl.java | 15 +++---
 .../vo/CompanyStaffReqVO.java                 |  4 +-
 .../vo/CompanyStaffRespVO.java                |  4 +-
 .../mapper/company/CompanyStaffMapper.xml     | 53 -------------------
 .../mapper/staff/CompanyStaffMapper.xml       |  9 ++++
 pom.xml                                       |  5 +-
 yudao-dependencies/pom.xml                    |  2 +-
 yudao-server/pom.xml                          | 10 ++--
 .../src/main/resources/application.yaml       |  4 +-
 13 files changed, 46 insertions(+), 90 deletions(-)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/controller/admin/CompanyStaffController.java (94%)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/entity/CompanyStaff.java (97%)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/mapper/CompanyStaffMapper.java (62%)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/service/CompanyStaffService.java (83%)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/service/impl/CompanyStaffServiceImpl.java (70%)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/vo/CompanyStaffReqVO.java (59%)
 rename dl-module-company/src/main/java/cn/iocoder/yudao/module/{company => staff}/vo/CompanyStaffRespVO.java (71%)
 delete mode 100644 dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml
 create mode 100644 dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml

diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyStaffController.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java
similarity index 94%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyStaffController.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java
index d77d74c3..3df25b2c 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyStaffController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java
@@ -1,14 +1,14 @@
-package cn.iocoder.yudao.module.company.controller.admin;
+package cn.iocoder.yudao.module.staff.controller.admin;
 
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.company.entity.CompanyStaff;
-import cn.iocoder.yudao.module.company.service.CompanyStaffService;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffRespVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/entity/CompanyStaff.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java
similarity index 97%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/entity/CompanyStaff.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java
index af0d559f..a9b64c98 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/entity/CompanyStaff.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.company.entity;
+package cn.iocoder.yudao.module.staff.entity;
 
 
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/mapper/CompanyStaffMapper.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/mapper/CompanyStaffMapper.java
similarity index 62%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/mapper/CompanyStaffMapper.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/mapper/CompanyStaffMapper.java
index 9470f15d..9c460e39 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/mapper/CompanyStaffMapper.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/mapper/CompanyStaffMapper.java
@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.module.company.mapper;
+package cn.iocoder.yudao.module.staff.mapper;
 
-import cn.iocoder.yudao.module.company.entity.CompanyStaff;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,7 +18,5 @@ import java.util.List;
 @Mapper
 public interface CompanyStaffMapper extends BaseMapper<CompanyStaff> {
 
-    IPage<CompanyStaff> selectStaffListPage();
-
-    List<CompanyStaff> selectList();
+    IPage<CompanyStaff> selectListPage(@Param("map") CompanyStaffReqVO companyStaffReqVO, Page<CompanyStaff> page);
 }
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/CompanyStaffService.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
similarity index 83%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/CompanyStaffService.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
index 330c99a0..2112e331 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/CompanyStaffService.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.company.service;
+package cn.iocoder.yudao.module.staff.service;
 
-import cn.iocoder.yudao.module.company.entity.CompanyStaff;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffRespVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyStaffServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
similarity index 70%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyStaffServiceImpl.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
index fa59087e..e81a9372 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyStaffServiceImpl.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
@@ -1,10 +1,10 @@
-package cn.iocoder.yudao.module.company.service.impl;
+package cn.iocoder.yudao.module.staff.service.impl;
 
-import cn.iocoder.yudao.module.company.entity.CompanyStaff;
-import cn.iocoder.yudao.module.company.mapper.CompanyStaffMapper;
-import cn.iocoder.yudao.module.company.service.CompanyStaffService;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
-import cn.iocoder.yudao.module.company.vo.CompanyStaffRespVO;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.mapper.CompanyStaffMapper;
+import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
+import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,8 +32,7 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
      **/
     @Override
     public IPage<CompanyStaff> queryListPage(CompanyStaffReqVO pageReqVO, Page<CompanyStaff> page) {
-        staffMapper.selectList();
-        return staffMapper.selectStaffListPage();
+        return staffMapper.selectListPage(pageReqVO, page);
     }
 
     @Override
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffReqVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffReqVO.java
similarity index 59%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffReqVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffReqVO.java
index a93c7312..77a0e8c3 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffReqVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffReqVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.company.vo;
+package cn.iocoder.yudao.module.staff.vo;
 
-import cn.iocoder.yudao.module.company.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
 import lombok.Data;
 
 /**
diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffRespVO.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffRespVO.java
similarity index 71%
rename from dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffRespVO.java
rename to dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffRespVO.java
index 6a7a45cc..d2cc6852 100644
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffRespVO.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffRespVO.java
@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.company.vo;
+package cn.iocoder.yudao.module.staff.vo;
 
-import cn.iocoder.yudao.module.company.entity.CompanyStaff;
+import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
 import lombok.Data;
 
 import java.util.List;
diff --git a/dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml b/dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml
deleted file mode 100644
index 4f1b3679..00000000
--- a/dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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="cn.iocoder.yudao.module.company.mapper.CompanyStaffMapper">
-
-    <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.company.entity.CompanyStaff">
-        <id property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="corpId" column="corp_id" jdbcType="VARCHAR"/>
-        <result property="userId" column="user_id" jdbcType="BIGINT"/>
-        <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
-        <result property="workNo" column="work_no" jdbcType="VARCHAR"/>
-        <result property="name" column="name" jdbcType="VARCHAR"/>
-        <result property="tel" column="tel" jdbcType="VARCHAR"/>
-        <result property="sex" column="sex" jdbcType="VARCHAR"/>
-        <result property="address" column="address" jdbcType="VARCHAR"/>
-        <result property="workDate" column="work_date" jdbcType="DATE"/>
-        <result property="workYear" column="work_year" jdbcType="DECIMAL"/>
-        <result property="joinedDate" column="joined_date" jdbcType="DATE"/>
-        <result property="joinedYear" column="joined_year" jdbcType="DECIMAL"/>
-        <result property="education" column="education" jdbcType="VARCHAR"/>
-        <result property="content" column="content" jdbcType="VARCHAR"/>
-        <result property="uniqueCode" column="unique_code" jdbcType="VARCHAR"/>
-        <result property="fileIds" column="file_ids" jdbcType="VARCHAR"/>
-        <result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/>
-        <result property="deleted" column="deleted" jdbcType="BIT"/>
-        <result property="creator" column="creator" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="updater" column="updater" jdbcType="VARCHAR"/>
-        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        select
-            id,corp_id,user_id,
-            dept_id,work_no,name,
-            tel,sex,address,
-            work_date,work_year,joined_date,
-            joined_year,education,content,
-            unique_code,file_ids,tenant_id,
-            deleted,creator,create_time,
-            updater,update_time
-        from company_staff
-    </sql>
-
-    <select id="selectStaffListPage" resultMap="BaseResultMap">
-        <include refid="Base_Column_List" />
-    </select>
-
-    <select id="selectList" resultType="cn.iocoder.yudao.module.company.entity.CompanyStaff">
-        <include refid="Base_Column_List" />
-    </select>
-</mapper>
\ No newline at end of file
diff --git a/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml b/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml
new file mode 100644
index 00000000..b956f97d
--- /dev/null
+++ b/dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml
@@ -0,0 +1,9 @@
+<?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="cn.iocoder.yudao.module.staff.mapper.CompanyStaffMapper">
+    <select id="selectListPage" resultType="cn.iocoder.yudao.module.staff.entity.CompanyStaff">
+        select * from company_staff
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 186234fa..7676f900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,16 +15,17 @@
         <module>yudao-module-infra</module>
 <!--        <module>yudao-module-member</module>-->
         <module>yudao-module-bpm</module>
-        <module>yudao-module-report</module>
+<!--        <module>yudao-module-report</module>-->
 <!--        <module>yudao-module-mp</module>-->
 <!--        <module>yudao-module-pay</module>-->
 <!--        <module>yudao-module-mall</module>-->
         <module>yudao-module-crm</module>
         <module>yudao-module-erp</module>
         <module>dl-module-base</module>
+        <module>dl-module-company</module>
         <!-- Server 主项目 -->
         <module>yudao-server</module>
-        <module>dl-module-company</module>
+
         <!--        <module>yudao-module-ai</module>-->
     </modules>
 
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 19053428..d0233305 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -502,7 +502,7 @@
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
+<!--                <version>${guice.version}</version>-->
             </dependency>
 
             <dependency>
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index e2cf2bbc..33dea56d 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -51,11 +51,11 @@
 <!--        </dependency>-->
 
         <!-- 数据报表。默认注释，保证编译速度 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-report-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.iocoder.boot</groupId>-->
+<!--            <artifactId>yudao-module-report-biz</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
         <!-- 工作流。默认注释，保证编译速度 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index d23fdee7..efcf0b37 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -80,7 +80,9 @@ mybatis-plus:
   type-aliases-package:
     - ${yudao.info.base-package}.module.*.dal.dataobject
     - ${yudao.info.base-package}.module.*.entity
-  mapper-locations: classpath:/mapper/*/*.xml
+  mapper-locations:
+    - classpath*:mapper/*/*.xml # 扫描子模块下的 mapper.xml文件
+    - classpath:mapper/*/*.xml # 扫描当前模块下的 mapper.xml 文件
   encryptor:
     password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成