From ecd5ad21abb8dcf3d1ad78ea5e205ad77ac0a288 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Mon, 18 May 2020 16:13:59 +0800
Subject: [PATCH] fix bug

---
 .idea/workspace.xml                           | 25 +++++--------
 .../app/controller/DepartmentsController.java |  8 ++---
 .../app/controller/StaffController.java       | 36 +++++++++++++++++++
 .../lz/modules/sys/oauth2/OAuth2Filter.java   |  2 +-
 .../resources/mapper/generator/StaffDao.xml   |  2 +-
 5 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 335c6a88..b0457764 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,19 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/DepartmentsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/DepartmentsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/DepartmentsDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/DepartmentsDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/DepartmentsDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/DepartmentsDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/DepartmentsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/DepartmentsController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/DepartmentsDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/DepartmentsDao.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/DepartmentsService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/DepartmentsService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/DepartmentsDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/DepartmentsDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -163,7 +154,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="58139000" />
+      <workItem from="1588936950753" duration="62186000" />
     </task>
     <servers />
   </component>
@@ -211,16 +202,16 @@
           <line>54</line>
           <option name="timeStamp" value="51" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java</url>
-          <line>102</line>
-          <option name="timeStamp" value="55" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysMenuController.java</url>
           <line>43</line>
           <option name="timeStamp" value="56" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java</url>
+          <line>79</line>
+          <option name="timeStamp" value="62" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java
index 7369874e..cec03752 100644
--- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java
+++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java
@@ -33,11 +33,11 @@ public class DepartmentsController {
     @Autowired
     private DepartmentsService departmentsService;
 
-    /**
-     * 列表
-     */
+            /**
+             * 列表
+             */
     @RequestMapping("/list")
-//    @RequiresPermissions("staff:structure:list")
+    //    @RequiresPermissions("staff:structure:list")
     public List<DepartmentsDto> list() {
         List<DepartmentsDto> departmentList = departmentsService.getDepartmentTree();
 
diff --git a/src/main/java/com/lz/modules/app/controller/StaffController.java b/src/main/java/com/lz/modules/app/controller/StaffController.java
index 3a5bc3e0..00018107 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffController.java
@@ -121,6 +121,42 @@ public class StaffController {
         return R.ok().put("data", data);
     }
 
+    /**
+     * 列表
+     */
+    @RequestMapping("/statistical")
+//    @RequiresPermissions("staff:info:statistical")
+    public R statistical(@RequestParam Map<String, Object> params) {
+
+        //部门Id
+        String departmentId = "";
+        //统计时间起
+        String beginDate = "";
+        //统计时间止
+        String endDate = "";
+
+        if (params.containsKey("departmentId")) {
+            departmentId = params.get("departmentId").toString();
+        }
+
+        if (params.containsKey("beginDate")) {
+            beginDate = params.get("beginDate").toString();
+        }
+
+        if (params.containsKey("endDate")) {
+            endDate = params.get("endDate").toString();
+        }
+//
+//        List<StaffDto> staffInfos = staffService.getStaffInfos(currentPage, limit, departmentId, name, staffStatus);
+//        //总页码
+//        int maxCount = staffService.getStaffInfoCount(departmentId, name, staffStatus);
+//
+        R ret = R.ok();
+//        PageUtils pageInfo = new PageUtils(staffInfos, maxCount, limit, currentPage);
+//        ret.put("page", pageInfo);
+        return ret;
+    }
+
     /**
      * 保存
      */
diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
index 70dd6c00..45986b66 100644
--- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
+++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
@@ -68,7 +68,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
             return false;
         }
         return executeLogin(request, response);
-        //            return true;
+//        return true;
 
     }
 
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 5c27ce2e..0be3b68e 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -108,7 +108,7 @@
             and dsr.department_id=#{departmentId}
         </if>
         <if test="name != null and name != ''">
-            and dsr.name=#{name}
+            and ls.name=#{name}
         </if>
         limit  #{startIndex}, #{pageLimit}
     </select>