Merge remote-tracking branch 'origin/develop' into develop

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TApprovalRecord.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.salary.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 审批记录表
+ *
+ * @author huyc
+ * @date 2022-08-08 22:54:44
+ */
+@Data
+@TableName("t_approval_record")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "审批记录表")
+public class TApprovalRecord extends BaseEntity {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelProperty("主键")
+	private String id;
+	/**
+	 * 实体id
+	 */
+	@ExcelAttribute(name = "实体id", isNotEmpty = true, errorInfo = "实体id不能为空", maxLength = 32)
+	@NotBlank(message = "实体id不能为空")
+	@Length(max = 32, message = "实体id不能超过32个字符")
+	@ExcelProperty("实体id")
+	private String salaryId;
+	/**
+	 * 节点id
+	 */
+	@ExcelAttribute(name = "节点id", isNotEmpty = true, errorInfo = "节点id不能为空", maxLength = 32)
+	@NotBlank(message = "节点id不能为空")
+	@Length(max = 32, message = "节点id不能超过32个字符")
+	@ExcelProperty("节点id")
+	private String nodeId;
+	/**
+	 * 审核人id
+	 */
+	@ExcelAttribute(name = "审核人id", isNotEmpty = true, errorInfo = "审核人id不能为空", maxLength = 32)
+	@NotBlank(message = "审核人id不能为空")
+	@Length(max = 32, message = "审核人id不能超过32个字符")
+	@ExcelProperty("审核人id")
+	private String approvalMan;
+	/**
+	 * 审核人姓名
+	 */
+	@ExcelAttribute(name = "审核人姓名", isNotEmpty = true, errorInfo = "审核人姓名不能为空", maxLength = 50)
+	@NotBlank(message = "审核人姓名不能为空")
+	@Length(max = 50, message = "审核人姓名不能超过50个字符")
+	@ExcelProperty("审核人姓名")
+	private String approvalManName;
+	/**
+	 * 审核时间
+	 */
+	@ExcelAttribute(name = "审核时间", isDate = true)
+	@ExcelProperty("审核时间")
+	private Date approvalTime;
+	/**
+	 * 审核结果 0 通过 1不通过 2 待审核 3 已提交
+	 */
+	@ExcelAttribute(name = "审核结果 0 通过 1不通过 2 待审核 3 已提交", maxLength = 1)
+	@Length(max = 1, message = "审核结果 0 通过 1不通过 2 待审核 3 已提交不能超过1个字符")
+	@ExcelProperty("审核结果 0 通过 1不通过 2 待审核 3 已提交")
+	private String approvalResult;
+	/**
+	 * 审核意见
+	 */
+	@ExcelAttribute(name = "审核意见", maxLength = 500)
+	@Length(max = 500, message = "审核意见不能超过500个字符")
+	@ExcelProperty("审核意见")
+	private String approvalOpinion;
+
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TApprovalRecordController.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.salary.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 审批记录表
+ *
+ * @author huyc
+ * @date 2022-08-08 22:54:44
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tapprovalrecord" )
+@Tag(name = "审批记录表管理")
+public class TApprovalRecordController {
+
+    private final  TApprovalRecordService tApprovalRecordService;
+
+    
+    /**
+     * 简单分页查询
+     * @param page 分页对象
+     * @param tApprovalRecord 审批记录表
+     * @return
+     */
+    @Operation(description = "简单分页查询")
+    @GetMapping("/page")
+    public R<IPage<TApprovalRecord>> getTApprovalRecordPage(Page<TApprovalRecord> page, TApprovalRecord tApprovalRecord) {
+        return  new R<>(tApprovalRecordService.getTApprovalRecordPage(page,tApprovalRecord));
+    }
+    /**
+     * 不分页查询
+     * @param tApprovalRecord 审批记录表
+     * @return
+     */
+    @Operation(summary = "不分页查询", description = "不分页查询")
+    @PostMapping("/noPage" )
+    public R<List<TApprovalRecord>> getTApprovalRecordNoPage(@RequestBody TApprovalRecord tApprovalRecord) {
+        return R.ok(tApprovalRecordService.noPageDiy(tApprovalRecord));
+    }
+
+    /**
+     * 通过id查询审批记录表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('salary_tapprovalrecord_get')")
+    @GetMapping("/{id}" )
+    public R<TApprovalRecord> getById(@PathVariable("id" ) String id) {
+        return R.ok(tApprovalRecordService.getById(id));
+    }
+
+    /**
+     * 新增审批记录表
+     * @param tApprovalRecord 审批记录表
+     * @return R
+     */
+    @Operation(summary = "新增审批记录表", description = "新增审批记录表：hasPermission('salary_tapprovalrecord_add')")
+    @SysLog("新增审批记录表" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('salary_tapprovalrecord_add')" )
+    public R<Boolean> save(@RequestBody TApprovalRecord tApprovalRecord) {
+        return R.ok(tApprovalRecordService.save(tApprovalRecord));
+    }
+
+    /**
+     * 修改审批记录表
+     * @param tApprovalRecord 审批记录表
+     * @return R
+     */
+    @Operation(summary = "修改审批记录表", description = "修改审批记录表：hasPermission('salary_tapprovalrecord_edit')")
+    @SysLog("修改审批记录表" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('salary_tapprovalrecord_edit')" )
+    public R<Boolean> updateById(@RequestBody TApprovalRecord tApprovalRecord) {
+        return R.ok(tApprovalRecordService.updateById(tApprovalRecord));
+    }
+
+    /**
+     * 通过id删除审批记录表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id删除审批记录表", description = "通过id删除审批记录表：hasPermission('salary_tapprovalrecord_del')")
+    @SysLog("通过id删除审批记录表" )
+    @DeleteMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('salary_tapprovalrecord_del')" )
+    public R<Boolean> removeById(@PathVariable String id) {
+        return R.ok(tApprovalRecordService.removeById(id));
+    }
+
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -126,4 +126,19 @@ public class TSalaryStandardController {
 	public R<IPage<TSalaryStandard>> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
 		return new R<>(tSalaryStandardService.getTSalaryStandardAuditPage(page, tSalaryStandard));
 	}
+
+	/**
+	 * 审核
+	 *
+	 * @param auditFlag 是否通过 0 是 1 否
+	 * @param AuditRemark 审核意见
+	 * @param id
+	 * @return
+	 */
+	@Operation(description = "薪酬审核")
+	@PostMapping("/salaryStandardAudit")
+	public R salaryStandardAudit(@RequestParam String auditFlag, @RequestParam(required = false) String AuditRemark,
+								@RequestParam String id) {
+		return tSalaryStandardService.salaryStandardAudit(auditFlag, AuditRemark, id);
+	}
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TApprovalRecordMapper.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.salary.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 审批记录表
+ *
+ * @author huyc
+ * @date 2022-08-08 22:54:44
+ */
+@Mapper
+public interface TApprovalRecordMapper extends BaseMapper<TApprovalRecord> {
+    /**
+     * 审批记录表简单分页查询
+     * @param tApprovalRecord 审批记录表
+     * @return
+     */
+    IPage<TApprovalRecord> getTApprovalRecordPage(Page<TApprovalRecord> page, @Param("tApprovalRecord") TApprovalRecord tApprovalRecord);
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TApprovalRecordService.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.salary.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 审批记录表
+ *
+ * @author huyc
+ * @date 2022-08-08 22:54:44
+ */
+public interface TApprovalRecordService extends IService<TApprovalRecord> {
+    /**
+     * 审批记录表简单分页查询
+     * @param tApprovalRecord 审批记录表
+     * @return
+     */
+    IPage<TApprovalRecord> getTApprovalRecordPage(Page<TApprovalRecord> page, TApprovalRecord tApprovalRecord);
+
+    List<TApprovalRecord> noPageDiy(TApprovalRecord searchVo);
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java

@@ -56,4 +56,13 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
 	 * @return
 	 */
 	IPage<TSalaryStandard> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard);
+
+	/**
+	 * 标准薪酬工资表审核
+	 * @param auditFlag 是否通过 0 是 1 否
+	 * @param AuditRemark 审核意见
+	 * @param id
+	 * @return
+	 */
+	R salaryStandardAudit(String auditFlag, String AuditRemark,String id);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TApprovalRecordServiceImpl.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.salary.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
+import com.yifu.cloud.plus.v1.yifu.salary.mapper.TApprovalRecordMapper;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+/**
+ * 审批记录表
+ *
+ * @author huyc
+ * @date 2022-08-08 22:54:44
+ */
+@Log4j2
+@Service
+public class TApprovalRecordServiceImpl extends ServiceImpl<TApprovalRecordMapper, TApprovalRecord> implements TApprovalRecordService {
+    /**
+     * 审批记录表简单分页查询
+     * @param tApprovalRecord 审批记录表
+     * @return
+     */
+    @Override
+    public IPage<TApprovalRecord> getTApprovalRecordPage(Page<TApprovalRecord> page, TApprovalRecord tApprovalRecord){
+        return baseMapper.getTApprovalRecordPage(page,tApprovalRecord);
+    }
+
+    @Override
+    public List<TApprovalRecord> noPageDiy(TApprovalRecord searchVo) {
+        LambdaQueryWrapper<TApprovalRecord> wrapper = buildQueryWrapper(searchVo);
+        return baseMapper.selectList(wrapper);
+    }
+
+    private LambdaQueryWrapper buildQueryWrapper(TApprovalRecord entity){
+        LambdaQueryWrapper<TApprovalRecord> wrapper = Wrappers.lambdaQuery();
+        if (Common.isNotNull(entity.getSalaryId())){
+            wrapper.eq(TApprovalRecord::getSalaryId,entity.getSalaryId());
+        }
+        return wrapper;
+    }
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -25,14 +25,13 @@ import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.excel.util.ListUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
+import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService;
@@ -229,4 +228,23 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 	public IPage<TSalaryStandard> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
 		return baseMapper.getTSalaryStandardAuditPage(page, tSalaryStandard);
 	}
+
+	@Override
+	public R salaryStandardAudit(String auditFlag, String auditRemark, String id) {
+		YifuUser user = SecurityUtils.getUser();
+		TSalaryStandard tSalaryStandard = baseMapper.selectById(id);
+		if (Common.isNotNull(tSalaryStandard)) {
+			if (CommonConstants.ZERO_STRING.equals(auditFlag)) {
+				tSalaryStandard.setStatus(CommonConstants.TWO_INT);
+			} else {
+				tSalaryStandard.setStatus(CommonConstants.FIVE_INT);
+			}
+			tSalaryStandard.setRemark(auditRemark);
+			tSalaryStandard.setAuditUser(user.getId());
+			tSalaryStandard.setAuditTime(DateUtil.getCurrentDateTime());
+			baseMapper.updateById(tSalaryStandard);
+		}
+		return R.ok();
+
+	}
 }

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TApprovalRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.salary.mapper.TApprovalRecordMapper">
+
+  <resultMap id="tApprovalRecordMap" type="com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord">
+    <id property="id" column="id"/>
+    <result property="salaryId" column="salary_id"/>
+    <result property="nodeId" column="node_id"/>
+    <result property="approvalMan" column="approval_man"/>
+    <result property="approvalManName" column="approval_man_name"/>
+    <result property="approvalTime" column="approval_time"/>
+    <result property="approvalResult" column="approval_result"/>
+    <result property="approvalOpinion" column="approval_opinion"/>
+  </resultMap>
+    <sql id="Base_Column_List">
+                a.id,
+                a.salary_id,
+                a.node_id,
+                a.approval_man,
+                a.approval_man_name,
+                a.approval_time,
+                a.approval_result,
+                a.approval_opinion
+    </sql>
+    <sql id="tApprovalRecord_where">
+        <if test="tApprovalRecord != null">
+                    <if test="tApprovalRecord.id != null and tApprovalRecord.id.trim() != ''">
+                        AND a.id = #{tApprovalRecord.id}
+                    </if>
+                    <if test="tApprovalRecord.salaryId != null and tApprovalRecord.salaryId.trim() != ''">
+                        AND a.salary_id = #{tApprovalRecord.salaryId}
+                    </if>
+                    <if test="tApprovalRecord.nodeId != null and tApprovalRecord.nodeId.trim() != ''">
+                        AND a.node_id = #{tApprovalRecord.nodeId}
+                    </if>
+                    <if test="tApprovalRecord.approvalMan != null and tApprovalRecord.approvalMan.trim() != ''">
+                        AND a.approval_man = #{tApprovalRecord.approvalMan}
+                    </if>
+                    <if test="tApprovalRecord.approvalManName != null and tApprovalRecord.approvalManName.trim() != ''">
+                        AND a.approval_man_name = #{tApprovalRecord.approvalManName}
+                    </if>
+                    <if test="tApprovalRecord.approvalTime != null">
+                        AND a.approval_time = #{tApprovalRecord.approvalTime}
+                    </if>
+                    <if test="tApprovalRecord.approvalResult != null and tApprovalRecord.approvalResult.trim() != ''">
+                        AND a.approval_result = #{tApprovalRecord.approvalResult}
+                    </if>
+                    <if test="tApprovalRecord.approvalOpinion != null and tApprovalRecord.approvalOpinion.trim() != ''">
+                        AND a.approval_opinion = #{tApprovalRecord.approvalOpinion}
+                    </if>
+        </if>
+    </sql>
+    <!--tApprovalRecord简单分页查询-->
+    <select id="getTApprovalRecordPage" resultMap="tApprovalRecordMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_approval_record a
+        <where>
+            1=1
+            <include refid="tApprovalRecord_where"/>
+        </where>
+    </select>
+</mapper>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -223,6 +223,7 @@
 			1=1
 			<include refid="where_page"/>
 		</where>
+		order by a.CREATE_TIME desc
 	</select>
 	<!--tSalaryStandard简单分页查询-->
 	<select id="getSalaryStandardExport" resultType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo">

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml

@@ -891,7 +891,7 @@
 		<include refid="Other_Base_Column_List"/>
 		FROM t_social_fund_info a
 		<where>
-			1=1
+			a.SOCIAL_ID is not null
 			<if test="empIdCard != null">
 				and a.EMP_IDCARD = #{empIdCard}
 			</if>
@@ -909,7 +909,7 @@
 		<include refid="Other_Base_Column_List"/>
 		FROM t_social_fund_info a
 		<where>
-			1=1
+			a.FUND_ID is not null
 			<if test="empIdCard != null">
 				and a.EMP_IDCARD = #{empIdCard}
 			</if>