修复公告展示和选择领导部门，查询领导错误的BUG

src/main/java/com/yeqifu/bus/controller/CustomerController.java

@@ -15,9 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -93,7 +90,6 @@ public class CustomerController {
     @RequestMapping("deleteCustomer")
     public ResultObj deleteCustomer(Integer id){
         try {
-//            customerService.removeById(id);
             customerService.deleteCustomerById(id);
             return ResultObj.DELETE_SUCCESS;
         } catch (Exception e) {
@@ -102,25 +98,6 @@ public class CustomerController {
         }
     }
 
-    /**
-     * 批量删除客户
-     * @param customerVo 选中的客户
-     * @return
-     */
-    @RequestMapping("batchDeleteCustomer")
-    public ResultObj batchDeleteCustomer(CustomerVo customerVo){
-        try {
-            Collection<Serializable> idList = new ArrayList<Serializable>();
-            for (Integer id : customerVo.getIds()) {
-                idList.add(id);
-            }
-            customerService.removeByIds(idList);
-            return ResultObj.DELETE_SUCCESS;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResultObj.DELETE_ERROR;
-        }
-    }
 
     /**
      * 加载所有客户的下拉列表

src/main/java/com/yeqifu/sys/controller/UserController.java

@@ -114,6 +114,9 @@ public class UserController {
         queryWrapper.eq("available",Constast.AVAILABLE_TRUE);
         queryWrapper.eq("type",Constast.USER_TYPE_NORMAL);
         List<User> list = userService.list(queryWrapper);
+        for (User user : list) {
+            System.out.println(user.toString());
+        }
         return new DataGridView(list);
     }
 

src/main/resources/file.properties

@@ -1 +1 @@
-filepath=/G:/upload/
+filepath=G:/upload/

src/main/resources/templates/business/customer/customerManager.html

@@ -63,9 +63,6 @@
         <button type="button" lay-event="add" shiro:hasPermission="customer:create" class="layui-btn layui-btn-sm layui-btn-normal layui-btn-radius">
             <i class="layui-icon layui-icon-add-1"></i>添加客户
         </button>
-        <button type="button" lay-event="deleteBatch" shiro:hasPermission="customer:create" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius">
-            <i class="layui-icon layui-icon-delete"></i>批量删除
-        </button>
     </div>
     <div id="customerRowBar" style="display: none;">
         <button type="button" lay-event="update" shiro:hasPermission="customer:update" class="layui-btn layui-btn-sm layui-btn-radius"><i
@@ -323,39 +320,6 @@
             });
         }
 
-        //批量删除
-        function batchDeleteCustomer() {
-            //得到选中行
-            var checkStatus = table.checkStatus('customerTable');
-            var dataLength = checkStatus.data.length;
-            if (dataLength>0){
-                layer.confirm('你确定要删除这些客户数据吗？',{icon: 3,title: '提示'},function (index) {
-                    //获取选中行数据
-                    var data = checkStatus.data;
-                    var ids = "";
-                    $.each(data,function (index, item) {
-                        if (index==0){
-                            ids+="ids="+item.id;
-                        }else {
-                            ids+="&ids="+item.id;
-                        }
-                    });
-                    $.post("/customer/batchDeleteCustomer",ids,function (res) {
-                        if (res.code==200){
-                            //重新刷新表格
-                            tableIns.reload({
-                                where:"",
-                            });
-                        }
-                        layer.msg(res.msg);
-                    });
-                    layer.close(index);
-                });
-            }else {
-                layer.msg("请选中操作行")
-            }
-        }
-
 
 
     });

src/main/resources/templates/system/index/deskManager.html

@@ -18,7 +18,7 @@
 	</blockquote>
 	<div class="layui-row layui-col-space10">
 		<div class="layui-col-lg6 layui-col-md12">
-			<blockquote class="layui-elem-quote title">最新文章 <i class="layui-icon layui-red">&#xe756;</i></blockquote>
+			<blockquote class="layui-elem-quote title">最新公告 <i class="layui-icon layui-red">&#xe756;</i></blockquote>
 			<table class="layui-table mag0" lay-skin="line">
 				<colgroup>
 					<col>
@@ -102,10 +102,10 @@
 	        $(".userAll span").text(data.length);
 	    })*/
 
-		$.get("/notice/loadAllNotice?page=1&limit=10",function(data){
+		$.get("/notice/loadAllNotice?page=1&limit=5",function(data){
 			var hotNewsHtml = '';
 			if(data.count>0){
-				for(var i=0;i<data.count;i++){
+				for(var i=0;i<5;i++){
 					hotNewsHtml += '<tr ondblclick="viewNews('+data.data[i].id+')">'
 							+'<td align="left"><a href="javascript:;"> '+data.data[i].title+'</a></td>'
 							+'<td>'+data.data[i].createtime.substring(0,10)+'</td>'

src/main/resources/templates/system/user/userManager.html

@@ -491,9 +491,9 @@
 
         //监听点击的方法
         dtree.on("node(leaderdeptTree)", function (obj) {
-            var deptid = obj.param.nodeId;
+            var deptId = obj.param.nodeId;
             //根据部门ID查询当前部门下面的领导列表
-            $.get("/user/loadUsersByDeptId",{deptid:deptid},function (res) {
+            $.get("/user/loadUsersByDeptId",{deptId:deptId},function (res) {
                 var users = res.data;
                 var dom_mgr=$("#mgr");
                 var html = "<option value=''>请选择直属领导</option>";