提交

src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzb.java

@@ -49,7 +49,7 @@ public class XcglAssoXzb extends Model<XcglAssoXzb> {
     private Integer xzxid;
     private Integer xzxid;
     
     
 	@ApiModelProperty(value="薪资项结果 ",example="薪资项结果")
 	@ApiModelProperty(value="薪资项结果 ",example="薪资项结果")
-    private String xzxjg;
+    private Double xzxjg;
 	
 	
 	@ApiModelProperty(value="企业id ",example="企业id")
 	@ApiModelProperty(value="企业id ",example="企业id")
 	private Integer qyid;
 	private Integer qyid;

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

@@ -74,9 +74,7 @@
 						 left join zzgl_bmgw_m um on um.id = m.up_id  
 						 left join zzgl_bmgw_m um on um.id = m.up_id  
 					) as bmgw on bmgw.mid = emp.bmgw_id
 					) as bmgw on bmgw.mid = emp.bmgw_id
 		where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
 		where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
-		and (xzbs.xzyf = #{xzyf} or xzbs.xzyf = '')
-		and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
-		<if test="text != ''" >
+		<if test="text != null and text != ''" >
 			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
 			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
 		</if>
 		</if>
 		) as aa
 		) as aa