Merge branch 'zx_saas_1220' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysSuggestionQueryInfo.java

@@ -19,7 +19,7 @@ public class SysSuggestionQueryInfo extends QueryInfo {
     private SuggestionType type;
 
     @ApiModelProperty(value = "反馈类型")
-    private String suggestionType;
+    private Integer suggestionType;
 
     @ApiModelProperty(value = "处理状态")
     private Boolean handleFlag;

mec-biz/src/main/resources/config/mybatis/SysSuggestionMapper.xml

@@ -97,8 +97,8 @@
             <if test="search!=null and search!=''">
                 AND (su.real_name_ LIKE CONCAT('%', #{search}, '%') OR su.username_ LIKE CONCAT('%', #{search}, '%') OR ss.user_id_=#{search} OR su.phone_=#{search})
             </if>
-            <if test="suggestionType != null and suggestionType != ''">
-                AND sut.type_ = #{suggestionType}
+            <if test="suggestionType != null">
+                AND ss.suggestion_type_ = #{suggestionType}
             </if>
             <if test="handleFlag != null">
                 AND ss.handle_flag_ = #{handleFlag}