Merge branch 'release/2.8.3.2306.01' into feature/statisticDataPerspective

src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java

@@ -155,6 +155,8 @@ public class SalaryItemBO {
                             .dataType(Optional.ofNullable(salaryDataTypeEnum)
                                     .map(e -> SalaryI18nUtil.getI18nLabel(e.getLabelId(), e.getDefaultLabel()))
                                     .orElse(StringUtils.EMPTY))
+                            .formulaId(salaryItemPO.getFormulaId())
+                            .formulaContent(formulaMap.getOrDefault(salaryItemPO.getFormulaId(),""))
                             .taxDeclarationColumn(buildTaxDeclarationColumn(salaryItemPO.getCode()))
                             .sortedIndex(salaryItemPO.getSortedIndex())
                             .description(salaryItemPO.getDescription())

src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml

@@ -160,10 +160,10 @@
             AND
             t.payment_organization = #{param.paymentOrganization}
         </if>
-        <if test="param.creator != null">
-            AND
-            t.creator = #{param.creator}
-        </if>
+<!--        <if test="param.creator != null">-->
+<!--            AND-->
+<!--            t.creator = #{param.creator}-->
+<!--        </if>-->
     </sql>
 
     <sql id="paramSql">