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

@@ -72,6 +72,7 @@
                 <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}" multiple>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
+                <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 默认为全部人员</span>
             </div>
         </div>
         <div class="form-group">
@@ -131,7 +132,7 @@
         }
         $("#alertContentItem").hide();
         $("#alertImageItem").hide();
-        $("#userType").selectpicker('val',[0,1,3,4]);
+        // $("#userType").selectpicker('val',[0,1,3,4]);
         getCompanyList(obj);
         $('#avatar').on('change', function () {
             var reader = new FileReader();
@@ -237,9 +238,6 @@
             },
             alertNum: {
                 required:true
-            },
-            userType: {
-                required:true
             }
         },
     });
@@ -266,18 +264,20 @@
 
     function submitHandler() {
         if ($.validate.form()) {
-            debugger
             var alertTitle = $('#alertTitle').val();
             var alertType = $('#alertType').val();
             var contentVal = $('#alertContent').val();
             var startTime = $('#alertStartTime').val().replace('T',' ');
             var endTime = $('#alertEndTime').val().replace('T',' ');
             var alertNum = $('#alertNum').val();
-            var userType = $('#userType').val().join(',');
+            var userType;
+            if ($('#userType').val()) {
+                userType = $('#userType').val().join(',');
+            }else {
+                userType = '';
+            }
             if (new Date(startTime).getTime() - new Date(endTime).getTime() >= 0){
                 $.modal.alertWarning("弹框结束时间不能小于开始时间");
-            }else if ($('#userType').selectpicker('val') == null) {
-                $.modal.msg("请选择通知人员");
             } else {
                 var objSubmit = {
                     alertTitle:alertTitle,

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

@@ -74,6 +74,7 @@
                     <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}" multiple>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{userType}"></option>
                     </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 默认为全部人员</span>
                 </div>
             </div>
             <div class="form-group">
@@ -263,9 +264,6 @@
                 },
                 alertNum: {
                     required:true
-                },
-                userType: {
-                    required:true
                 }
             }
         });
@@ -282,8 +280,6 @@
                 var userType = $('#userType').val().join(',');
                 if (new Date(startTime).getTime() - new Date(endTime).getTime() >= 0){
                     $.modal.alertWarning("弹框结束时间不能小于开始时间");
-                }else if ($('#userType').selectpicker('val') == null) {
-                    $.modal.msg("请选择通知人员");
                 }else {
                     var objSubmit = {
                         alertTitle:alertTitle,

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

@@ -45,7 +45,7 @@
                     <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 默认为全部人员</span>
                 </div>
             </div>
             <!--<div class="form-group">    -->
@@ -65,9 +65,9 @@
     <script type="text/javascript">
         var prefix = ctx + "system/lantern"
 
-        $(document).ready(function () {
-            $("#userType").selectpicker('val',[0,1,2,4]);
-        })
+        // $(document).ready(function () {
+        //     $("#userType").selectpicker('val',[0,1,2,4]);
+        // })
 
         $("#form-lantern-add").validate({
             focusCleanup: true,
@@ -86,11 +86,12 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                if ($('#userType').selectpicker('val') == null) {
-                    $.modal.msg("请选择通知人员");
-                }else {
-                    $.operate.save(prefix + "/add", $('#form-lantern-add').serialize());
-                }
+                // if ($('#userType').selectpicker('val') == null) {
+                //     $.modal.msg("请选择通知人员");
+                // }else {
+                //     $.operate.save(prefix + "/add", $('#form-lantern-add').serialize());
+                // }
+                $.operate.save(prefix + "/add", $('#form-lantern-add').serialize());
             }
         }
 

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

@@ -45,7 +45,7 @@
                     <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{userType}"></option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 默认为全部人员</span>
                 </div>
             </div>
             <!--<div class="form-group">-->
@@ -95,11 +95,12 @@
 
         function submitHandler() {
             if ($.validate.form()) {
-                if ($('#userType').selectpicker('val') == null) {
-                    $.modal.msg("请选择通知人员");
-                }else {
-                    $.operate.save(prefix + "/edit", $('#form-lantern-edit').serialize());
-                }
+                // if ($('#userType').selectpicker('val') == null) {
+                //     $.modal.msg("请选择通知人员");
+                // }else {
+                //     $.operate.save(prefix + "/edit", $('#form-lantern-edit').serialize());
+                // }
+                $.operate.save(prefix + "/edit", $('#form-lantern-edit').serialize());
             }
         }
 

suishenbang-admin/src/main/resources/templates/system/lantern/lantern.html

@@ -120,20 +120,24 @@
                     field : 'userType',
                     title : '公告人员',
                     formatter: function(value, row, index) {
-                        var userStr = '';
-                        if (value.indexOf('0') != -1){
-                            userStr += '立邦员工 ';
+                        if (value == null){
+                            return '立邦员工 经销商 仿石漆 金牌店';
+                        } else {
+                            var userStr = '';
+                            if (value.indexOf('0') != -1){
+                                userStr += '立邦员工 ';
+                            }
+                            if (value.indexOf('1') != -1){
+                                userStr += '经销商 ';
+                            }
+                            if (value.indexOf('2') != -1){
+                                userStr += '仿石漆 ';
+                            }
+                            if (value.indexOf('4') != -1){
+                                userStr += '金牌店 ';
+                            }
+                            return userStr;
                         }
-                        if (value.indexOf('1') != -1){
-                            userStr += '经销商 ';
-                        }
-                        if (value.indexOf('2') != -1){
-                            userStr += '仿石漆 ';
-                        }
-                        if (value.indexOf('4') != -1){
-                            userStr += '金牌店 ';
-                        }
-                        return userStr;
                     }
                 },
                 // {