预派单 代码修改

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1196,7 +1196,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		list = gettEmpProInfoExportVos(idstr, projectDTO);
 
 		ServletOutputStream out = null;
-		if (list != null && !list.isEmpty()) {
+		if (list == null || list.isEmpty()) {
 			list = new ArrayList<>();
 		}
 		try {

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java

@@ -17,6 +17,9 @@ import java.time.LocalDateTime;
 @Data
 public class TPreDispatchExportVo implements Serializable {
 
+	@ExcelAttribute(name = "主键", needExport = true)
+	private String id;
+
 	/**
 	 * 0 派增  1 派减
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -772,7 +772,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		list = baseMapper.getListForExport(tPreDispatchInfo);
 
 		ServletOutputStream out = null;
-		if (list != null && !list.isEmpty()) {
+		if (list == null || list.isEmpty()) {
 			list = new ArrayList<>();
 		}
 		try {

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

@@ -233,12 +233,12 @@
     </sql>
     <sql id="tPreDispatchInfo_where">
         <if test="tPreDispatchInfo != null">
-		<if test="tPreDispatchInfo.idList != null">
-			AND a.id in
-			<foreach item="idStr" index="index" collection="tPreDispatchInfo.idList" open="(" separator="," close=")">
-				#{idStr}
-			</foreach>
-		</if>
+				<if test="tPreDispatchInfo.idList != null">
+				AND a.id in
+				<foreach item="idStr" index="index" collection="tPreDispatchInfo.idList" open="(" separator="," close=")">
+					#{idStr}
+				</foreach>
+				</if>
 		<if test="tPreDispatchInfo.idList == null">
                     <if test="tPreDispatchInfo.id != null and tPreDispatchInfo.id.trim() != ''">
                         AND a.ID = #{tPreDispatchInfo.id}