1、用印信息管理员工化

yudao-module-bpm/yudao-module-bpm-biz/pom.xml

@@ -36,10 +36,11 @@
             <artifactId>yudao-module-expense-api</artifactId>
             <version>${revision}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>cn.iocoder.boot</groupId>-->
-<!--            <artifactId>yudao-common</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-employee-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampinfo/vo/OaStampInfoPageReqVO.java

@@ -27,8 +27,8 @@ public class OaStampInfoPageReqVO extends PageParam {
     @Schema(description = "部门id", example = "101")
     private Long deptId;
 
-    @Schema(description = "员工职位")
-    private String position;
+    @Schema(description = "员工职位id")
+    private Long postId;
 
     @Schema(description = "用印标题", example = "用印标题")
     private String stampTitle;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampseal/OaStampSealController.java

@@ -148,8 +148,10 @@ public class OaStampSealController {
                     oaStampSealRespVO.setStatusDesc("未知");
                     break;
             }
-
-            oaStampSealRespVO.setCreateEmployeeName(adminUserMap.get(oaStampSealRespVO.getCreator()).getNickname());
+            AdminUserRespDTO adminUserRespDTO = adminUserMap.get(oaStampSealRespVO.getCreator());
+            if (adminUserRespDTO != null) {
+                oaStampSealRespVO.setCreateEmployeeName(adminUserRespDTO.getNickname());
+            }
         }
         return success(voPageResult);
     }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/stamp/stampinfo/OaStampInfoMapper.java

@@ -25,7 +25,7 @@ public interface OaStampInfoMapper extends BaseMapperX<OaStampInfoDO> {
                 .likeIfPresent(OaStampInfoDO::getEmployeeName, reqVO.getEmployeeName())
                 .eqIfPresent(OaStampInfoDO::getEmployeePhone, reqVO.getEmployeePhone())
                 .eqIfPresent(OaStampInfoDO::getDeptId, reqVO.getDeptId())
-                .eqIfPresent(OaStampInfoDO::getPosition, reqVO.getPosition())
+                .eqIfPresent(OaStampInfoDO::getPosition, reqVO.getPostId())
                 .eqIfPresent(OaStampInfoDO::getStampTitle, reqVO.getStampTitle())
                 .eqIfPresent(OaStampInfoDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(OaStampInfoDO::getInfoSource, reqVO.getInfoSource())

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/stamp/stampinfo/OaStampInfoServiceImpl.java

@@ -12,6 +12,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampinfo.vo.OaStampIn
 import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampinfo.vo.OaStampInfoSaveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampinfo.OaStampInfoDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.stamp.stampinfo.OaStampInfoMapper;
+import cn.iocoder.yudao.module.employee.api.EmployeeApi;
+import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.stereotype.Service;
@@ -40,6 +42,9 @@ public class OaStampInfoServiceImpl implements OaStampInfoService {
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private EmployeeApi employeeApi;
+
     @Override
     public Long createOaStampInfo(OaStampInfoSaveReqVO createReqVO) {
         // 登录人
@@ -47,17 +52,19 @@ public class OaStampInfoServiceImpl implements OaStampInfoService {
         if (loginUser == null) {
             throw exception(OA_LOGIN_USER_NOT_EXISTS);
         }
-        // 创建员工
-        Long createEmployeeId = loginUser.getId();
-        AdminUserRespDTO createEmployee = adminUserApi.getUser(createEmployeeId);
         // 插入准备
         OaStampInfoDO oaStampInfo = BeanUtils.toBean(createReqVO, OaStampInfoDO.class);
         // uuid
         oaStampInfo.setStampUuid(IdUtil.fastSimpleUUID());
         // 创建员工
-        oaStampInfo.setCreateEmployeeId(createEmployeeId);
-        oaStampInfo.setDeptId(createEmployee.getDeptId());
+        EmployeeRespDTO createEmployee = employeeApi.getEmployeeByUserId(loginUser.getId());
+        oaStampInfo.setCreateEmployeeId(createEmployee.getId());
+        // 用印员工
+        EmployeeRespDTO employee = employeeApi.getEmployeeById(createReqVO.getEmployeeId());
         // 部门
+        oaStampInfo.setDeptId(employee.getDeptId());
+        // 职位
+        oaStampInfo.setPosition(String.valueOf(employee.getPostId()));
         // 印章
         List<Long> stampSealId = createReqVO.getStampSealId();
         if (CollUtil.isNotEmpty(stampSealId)) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/stamp/stampinfo/OaStampInfoMapper.xml

@@ -13,27 +13,28 @@
         SELECT COUNT(si.id)
         FROM
         bpm_oa_stamp_info si
-        LEFT JOIN system_users su ON si.employee_id = su.id and su.deleted = 0
-        LEFT JOIN system_users su2 ON si.create_employee_id = su2.id and su2.deleted = 0
+        LEFT JOIN employee_info ei ON si.employee_id = ei.id and ei.deleted = 0
+        LEFT JOIN system_post sp ON sp.id = ei.post_id and sp.deleted = 0
+        LEFT JOIN employee_info ei2 ON si.create_employee_id = ei2.id and ei2.deleted = 0
         LEFT JOIN system_dept sd ON si.dept_id = sd.id and sd.deleted = 0
         WHERE si.deleted = 0
         <if test="page.employeeName != null and page.employeeName != ''">
-            AND su.nickname like concat('%',#{page.employeeName},'%')
+            AND ei.nickname like concat('%',#{page.employeeName},'%')
         </if>
         <if test="page.deptId != null">
             AND si.dept_id = #{page.deptId}
         </if>
-        <if test="page.position != null">
-            AND si.position = #{page.position}
+        <if test="page.postId != null">
+            AND sp.id = #{page.postId}
         </if>
         <if test="page.employeePhone != null and page.employeePhone != ''">
-            AND su.mobile like concat('%',#{page.employeePhone},'%')
+            AND ei.phone like concat('%',#{page.employeePhone},'%')
         </if>
         <if test="page.stampTitle != null and page.stampTitle != ''">
             AND si.stamp_title like concat('%',#{page.stampTitle},'%')
         </if>
         <if test="page.createEmployeeName != null and page.createEmployeeName != ''">
-            AND si.stamp_title like concat('%',#{page.createEmployeeName},'%')
+            AND ei2.name like concat('%',#{page.createEmployeeName},'%')
         </if>
         <if test="page.createTime != null and page.createTime.length > 0">
             AND si.create_time BETWEEN #{page.createTime[0]} AND #{page.createTime[1]}
@@ -45,7 +46,7 @@
         si.id,
         si.stamp_uuid,
         si.employee_id,
-        '职位' AS "position",
+        sp.name AS "position",
         si.dept_id,
         si.stamp_title,
         si.stamp_seal_id,
@@ -55,33 +56,34 @@
         si.info_source,
         si.create_employee_id,
         si.create_time,
-        su2.nickname createEmployeeName,
-        su.nickname employeeName,
-        su.mobile employeePhone,
+        ei2.name createEmployeeName,
+        ei.name employeeName,
+        ei.phone employeePhone,
         sd.`name` deptName
         FROM
         bpm_oa_stamp_info si
-        LEFT JOIN system_users su ON si.employee_id = su.id and su.deleted = 0
-        LEFT JOIN system_users su2 ON si.create_employee_id = su2.id and su2.deleted = 0
+        LEFT JOIN employee_info ei ON si.employee_id = ei.id and ei.deleted = 0
+        LEFT JOIN system_post sp ON sp.id = ei.post_id and sp.deleted = 0
+        LEFT JOIN employee_info ei2 ON si.create_employee_id = ei2.id and ei2.deleted = 0
         LEFT JOIN system_dept sd ON si.dept_id = sd.id and sd.deleted = 0
         WHERE si.deleted = 0
         <if test="page.employeeName != null and page.employeeName != ''">
-            AND su.nickname like concat('%',#{page.employeeName},'%')
+            AND ei.nickname like concat('%',#{page.employeeName},'%')
         </if>
         <if test="page.deptId != null">
             AND si.dept_id = #{page.deptId}
         </if>
-        <if test="page.position != null">
-            AND si.position = #{page.position}
+        <if test="page.postId != null">
+            AND sp.id = #{page.postId}
         </if>
         <if test="page.employeePhone != null and page.employeePhone != ''">
-            AND su.mobile like concat('%',#{page.employeePhone},'%')
+            AND ei.phone like concat('%',#{page.employeePhone},'%')
         </if>
         <if test="page.stampTitle != null and page.stampTitle != ''">
             AND si.stamp_title like concat('%',#{page.stampTitle},'%')
         </if>
         <if test="page.createEmployeeName != null and page.createEmployeeName != ''">
-            AND su2.nickname like concat('%',#{page.createEmployeeName},'%')
+            AND ei2.name like concat('%',#{page.createEmployeeName},'%')
         </if>
         <if test="page.createTime != null and page.createTime.length > 0">
             AND si.create_time BETWEEN #{page.createTime[0]} AND #{page.createTime[1]}

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/service/info/EmployeeInfoServiceImpl.java

@@ -115,6 +115,7 @@ public class EmployeeInfoServiceImpl implements EmployeeInfoService {
     @Override
     @TenantIgnore
     public EmployeeInfoDO getInfo(Long id) {
+        validateInfoExists(id);
         return infoMapper.selectById(id);
     }