wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
fumeiai 2020-05-18 16:25:23 +08:00
parent ecd5ad21ab
commit dc48f9978d
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@ -3,10 +3,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/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/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.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" />
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -154,7 +154,7 @@
<workItem from="1588159936850" duration="1226000" /> <workItem from="1588159936850" duration="1226000" />
<workItem from="1588161274115" duration="1691000" /> <workItem from="1588161274115" duration="1691000" />
<workItem from="1588163384182" duration="74761000" /> <workItem from="1588163384182" duration="74761000" />
<workItem from="1588936950753" duration="62186000" /> <workItem from="1588936950753" duration="62703000" />
</task> </task>
<servers /> <servers />
</component> </component>

2
src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
View File

@ -81,7 +81,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
if (intoStaffStatus == 1) { if (intoStaffStatus == 1) {
staffStatus = intoStaffStatus; staffStatus = intoStaffStatus;
} }
List<StaffDto> staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, currentPage * limit); List<StaffDto> staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, (currentPage - 1) * limit);
return staffInfos; return staffInfos;
} }

2
src/main/resources/mapper/generator/StaffDao.xml
View File

@ -122,7 +122,7 @@
and dsr.department_id=#{departmentId} and dsr.department_id=#{departmentId}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and dsr.name=#{name} and ls.name=#{name}
</if> </if>
</select> </select>

BIN
target/classes/com/lz/modules/app/controller/StaffController.class
View File

Binary file not shown.

BIN
target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class
View File

Binary file not shown.

4
target/classes/mapper/generator/StaffDao.xml
View File

@ -108,7 +108,7 @@
and dsr.department_id=#{departmentId} and dsr.department_id=#{departmentId}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and dsr.name=#{name} and ls.name=#{name}
</if> </if>
limit #{startIndex}, #{pageLimit} limit #{startIndex}, #{pageLimit}
</select> </select>
@ -122,7 +122,7 @@
and dsr.department_id=#{departmentId} and dsr.department_id=#{departmentId}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and dsr.name=#{name} and ls.name=#{name}
</if> </if>
</select> </select>