Merge remote-tracking branch 'origin/uploadFile-alert810' into uat

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

@@ -61,7 +61,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">用户类型：</label>
             <div class="col-sm-8">
-                <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
+                <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}">
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
@@ -122,6 +122,7 @@
         }
         $("#alertContentItem").hide();
         $("#alertImageItem").hide();
+        $("#userType").selectpicker('val','1');
         getCompanyList(obj);
         $('#avatar').on('change', function () {
             var reader = new FileReader();
@@ -241,7 +242,7 @@
             var startTime = $('#alertStartTime').val();
             var endTime = $('#alertEndTime').val();
             var alertNum = $('#alertNum').val();
-            var userType = $('#userType').val().join();
+            var userType = $('#userType').val();
             var objSubmit = {
                 alertType:alertType,
                 photoUrl:photoUrl,

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

@@ -141,14 +141,14 @@
                     field : 'userType',
                     title : '用户类型',
                     formatter: function(value, row, index) {
-                        if (value.indexOf('1') != -1 && value.indexOf('0') != -1){
+                        if (value.indexOf('2') != -1){
                             return '立邦人员、经销商';
                         }
-                        if (value.indexOf('1') != -1 && value.indexOf('0') == -1) {
+                        if (value.indexOf('1') != -1) {
                             return '经销商';
                         }
-                        if (value.indexOf('1') == -1 && value.indexOf('0') != -1) {
-                            return '立邦人员';
+                        if (value.indexOf('0') != -1) {
+                            return '立邦员工';
                         }
                     }
                 },

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

@@ -63,7 +63,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">用户类型：</label>
                 <div class="col-sm-8">
-                    <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
+                    <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{userType}"></option>
                     </select>
                 </div>
@@ -137,7 +137,7 @@
                 $("#alertContentItem").hide();
                 $("#div-bgUrl").html("<img src='" + formData.photoUrl + "' style='width:300px;margin-bottom: 5px;'>");
             }
-            $("#userType").selectpicker('val',formData.userType.split(','));
+            $("#userType").selectpicker('val',formData.userType);
             if (formData.salesLevel == 'company_level'){
                 var objhx1 = {
                     parType: 'company_level',
@@ -270,7 +270,7 @@
                 var startTime = $('#alertStartTime').val();
                 var endTime = $('#alertEndTime').val();
                 var alertNum = $('#alertNum').val();
-                var userType = $('#userType').val().join();
+                var userType = $('#userType').val();
                 var objSubmit = {
                     alertId:alertId,
                     alertType:alertType,

suishenbang-system/src/main/java/com/dgtly/system/domain/AlertConfiguration.java

@@ -64,8 +64,7 @@ public class AlertConfiguration extends BaseEntity
     private String photoUrl;
 
 
-
-    public void setAlertId(Long alertId) 
+    public void setAlertId(Long alertId)
     {
         this.alertId = alertId;
     }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/AlertConfigurationServiceImpl.java

@@ -1,9 +1,6 @@
 package com.dgtly.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.dgtly.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,11 +85,13 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
             }
             while (it.hasNext()) {
                 AlertConfiguration alert = it.next();
-                    if(orgCodes !=null && orgCodes.size()>0){
+                    if(orgCodes !=null && orgCodes.size()>0 && alert.getOrgCode() !=null && !("null").equals(alert.getOrgCode())){
                         if(orgCodes.contains(alert.getOrgCode())){
                             return 1;
                         }
-                }
+                }else{
+                        return 1;
+                    }
             }
         }else{
                     return 0;

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

@@ -44,9 +44,10 @@ 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 orgCode !='null' ">
-            and user_type =#{userType}
+        <if test="userType !=null and userType !='' and userType !='2'.toString() ">
+          and ( user_type =#{userType}  or user_type ='2')
         </if>
+
     </select>
     
     <select id="selectAlertConfigurationById" parameterType="Long" resultMap="AlertConfigurationResult">