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

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -346,24 +346,6 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("公积金总合计")
     private BigDecimal providentSum;
 
-    /**
-     * 社保核准表ID
-     */
-    @ExcelAttribute(name = "社保核准表ID" )
-    @Schema(description ="社保核准表ID")
-    @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保核准表ID")
-    private String socialSettlementId;
-
-    /**
-     * 公积金核准表ID
-     */
-    @ExcelAttribute(name = "公积金核准表ID" )
-    @Schema(description ="公积金核准表ID")
-    @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金核准表ID")
-    private String fundSettlementId;
-
     /**
      * 就职班组
      */
@@ -373,15 +355,6 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("就职班组")
     private String inauguralTeam;
 
-    /**
-     * 电信编号
-     */
-    @ExcelAttribute(name = "电信编号" )
-    @Schema(description ="电信编号")
-    @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("电信编号")
-    private String telecomNumber;
-
     /**
      * 排序字段
      */
@@ -391,24 +364,6 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("排序字段")
     private String sortTime;
 
-    /**
-     * 代理结算id
-     */
-    @ExcelAttribute(name = "代理结算id" )
-    @Schema(description ="代理结算id")
-    @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("代理结算id")
-    private String agentId;
-
-    /**
-     * 财务账单ID
-     */
-    @ExcelAttribute(name = "财务账单ID" )
-    @Schema(description ="财务账单ID")
-    @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("财务账单ID")
-    private String financeBillId;
-
 	/**
 	 * 推送状态
 	 */

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

@@ -327,24 +327,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("公积金总合计")
 	private BigDecimal providentSum;
-	/**
-	 * 社保核准表ID
-	 */
-	@Length(max = 32, message = "社保核准表ID 不能超过32 个字符")
-	@ExcelAttribute(name = "社保核准表ID", maxLength = 32)
-	@Schema(description = "社保核准表ID")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保核准表ID")
-	private String socialSettlementId;
-	/**
-	 * 公积金核准表ID
-	 */
-	@Length(max = 32, message = "公积金核准表ID 不能超过32 个字符")
-	@ExcelAttribute(name = "公积金核准表ID", maxLength = 32)
-	@Schema(description = "公积金核准表ID")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金核准表ID")
-	private String fundSettlementId;
 	/**
 	 * 就职班组
 	 */
@@ -354,15 +336,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("就职班组")
 	private String inauguralTeam;
-	/**
-	 * 电信编号
-	 */
-	@Length(max = 50, message = "电信编号 不能超过50 个字符")
-	@ExcelAttribute(name = "电信编号", maxLength = 50)
-	@Schema(description = "电信编号")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("电信编号")
-	private String telecomNumber;
 	/**
 	 * 排序字段
 	 */
@@ -372,24 +345,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("排序字段")
 	private String sortTime;
-	/**
-	 * 代理结算id
-	 */
-	@Length(max = 32, message = "代理结算id 不能超过32 个字符")
-	@ExcelAttribute(name = "代理结算id", maxLength = 32)
-	@Schema(description = "代理结算id")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("代理结算id")
-	private String agentId;
-	/**
-	 * 财务账单ID
-	 */
-	@Length(max = 32, message = "财务账单ID 不能超过32 个字符")
-	@ExcelAttribute(name = "财务账单ID", maxLength = 32)
-	@Schema(description = "财务账单ID")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("财务账单ID")
-	private String financeBillId;
 	/**
 	 * 单位补缴利息
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -80,6 +80,10 @@ public class TDispatchInfoController {
 		menuUtil.setAuthSql(user, tDispatchInfo);
 		if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 			tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			}
 		}
 		tDispatchInfo.setCreateBy(user.getId());
         return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
@@ -116,6 +120,10 @@ public class TDispatchInfoController {
 		menuUtil.setAuthSql(user, tDispatchInfo);
 		if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 			tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			}
 		}
 		return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
 	}