提交

src/main/java/cn/timer/api/dto/xcgl/SalaryoptionsDto.java

@@ -15,4 +15,5 @@ public class SalaryoptionsDto {
      * 状态 1：系统项；2：非系统项
      * 状态 1：系统项；2：非系统项
      */
      */
     private Integer opttype;
     private Integer opttype;
+    private Integer zxzzid;
 }
 }

src/main/resources/mapping/xcgl/XcglSalaryItemMapper.xml

@@ -44,6 +44,17 @@
 			<where>
 			<where>
                 <if test="opttype != null"> opt.type = #{opttype}</if>
                 <if test="opttype != null"> opt.type = #{opttype}</if>
             </where>
             </where>
+            UNION 
+				select 
+					8 AS itid,
+					'自定义项' AS itname,
+					0 AS optid,
+					zxz.salaryitem AS optname,
+					8 AS optitemid,
+					2 AS opttype 
+				from xcgl_asso_jsgzzx zxz 
+				where zxz.is_custom = 1
+				and zxz.xzzid = #{zxzzid}
 	</select>
 	</select>