代码迁移bug解决

chenrui

2025-02-28 8fd61364dc840ef15e02db0a047ca87a98972eec

代码迁移bug解决

 cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java

@@ -59,7 +59,7 @@
    }

    @ApiOperation(value = "导出岗位职业资格证书")
    @PostMapping("/exportPersonPostAuthorizationRecord")
    @GetMapping("/exportPersonPostAuthorizationRecord")
    public void exportPersonPostAuthorizationRecord(Integer id, HttpServletResponse response){
        personPostAuthorizationRecordService.exportPersonPostAuthorizationRecord(id,response);
    }

 cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java

@@ -18,7 +18,7 @@
 */
public interface PersonPersonnelCapacityMapper extends BaseMapper<PersonPersonnelCapacity> {

    IPage<PersonPersonnelCapacityDto> personPersonnelCapacityPage(Page page, Integer departLimsId, Integer userId, String userName);
    IPage<PersonPersonnelCapacityDto> personPersonnelCapacityPage(Page page, @Param("departLimsId") Integer departLimsId,@Param("userId") Integer userId,@Param("userName") String userName);

    /**
     * 查询人员能力接口

 cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.personnel.dto.PersonPostAuthorizationRecordDto;
import com.ruoyi.personnel.pojo.PersonPostAuthorizationRecord;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
@@ -16,5 +17,5 @@
 */
public interface PersonPostAuthorizationRecordMapper extends BaseMapper<PersonPostAuthorizationRecord> {

    IPage<PersonPostAuthorizationRecordDto> personPostAuthorizationRecordPage(Page page, Integer departLimsId, Integer userId, String userName);
    IPage<PersonPostAuthorizationRecordDto> personPostAuthorizationRecordPage(Page page, @Param("departLimsId") Integer departLimsId, @Param("userId") Integer userId, @Param("userName") String userName);
}

 cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml

@@ -16,10 +16,10 @@
        -- 取岗位
        left join cnas_person_basic_info cpbi on cpbi.user_id = cppc.user_id
        -- 取人员能力的岗位职责
        left join (SELECT GROUP_CONCAT(e.label) responsibilities, cppc.id
        left join (SELECT GROUP_CONCAT(e.dict_label) responsibilities, cppc.id
        from cnas_person_personnel_capacity cppc
        left join enums e on FIND_IN_SET(e.value, cppc.job_responsibilities)
        where e.category = '岗位职责'
        left join sys_dict_data e on FIND_IN_SET(e.dict_value, cppc.job_responsibilities)
        where e.dict_type = 'responsibilities_list'
        GROUP BY cppc.id) ecp on ecp.id = cppc.id
        <where>
            <if test="userId != null and userId != ''">