提交

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

@@ -63,5 +63,8 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> {
 	private String degkText;
 	@ApiModelProperty(value = "", example = "")
 	private Integer rulestate;
+	
+	@ApiModelProperty(value = "", example = "")
+	private Integer defaulttype;
 
 }
\ No newline at end of file

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

@@ -15,6 +15,7 @@
                 <result column="dygk_text" property="dygkText" />
                 <result column="degk_text" property="degkText" />
                 <result column="rulestate" property="rulestate" />
+                <result column="defaulttype" property="defaulttype" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -38,7 +39,7 @@
 	<select id="QuerySalaryRules" resultMap="BaseResultMap">
 			select * from xcgl_asso_xcjsgz jsgz
 				where jsgz.formulaname = #{formulaname}
-				ORDER BY jsgz.id ASC LIMIT 1
+				and jsgz.defaulttype = 1
 	</select>
 
 	<!--