Merge remote-tracking branch 'origin/alert' into alert

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html

@@ -84,8 +84,8 @@
 <th:block th:include="include :: bootstrap-select-js" />
 <script type="text/javascript">
     var prefix = ctx + "system/configuration"
-    var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
-    // var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
+    //var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
+    var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
     $(document).ready(function () {
         var obj = {

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

@@ -93,8 +93,8 @@
     <th:block th:include="include :: bootstrap-select-js" />
     <script type="text/javascript">
         var prefix = ctx + "system/configuration";
-        var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
-        // var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
+        //var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
+        var getCompanyListPrefix = "http://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
         $(document).ready(function () {
             var formArray = $('#form-configuration-edit').serializeArray();

suishenbang-system/src/main/resources/mapper/system/AlertConfigurationMapper.xml

@@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAlertConfigurationListFilter" parameterType="Long" resultMap="AlertConfigurationResult">
         <include refid="selectAlertConfigurationVo"/>
         WHERE alert_status = 1
-        <if test="userType !=null and userType !=''">
-            and user_type = #{userType}
+        <if test="userType !=null and userType !='' and userType !='0,1' ">
+            and user_type =#{userType}
         </if>
     </select>