aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-13 06:38:21 +08:00
parent 0fdd18f9ad
commit a9c2e9770e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
View File

@ -56,10 +56,7 @@ public class EmisCustomerUserController extends BaseController
public TableDataInfo list(EmisCustomerUser emisCustomerUser) public TableDataInfo list(EmisCustomerUser emisCustomerUser)
{ {
startPage(); startPage();
if(!"88888".equals(getLoginUser().getUser().getOwnerSiteCode())) { emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
}
List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
return getDataTable(list); return getDataTable(list);
} }
@ -69,9 +66,7 @@ public class EmisCustomerUserController extends BaseController
public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser)
{ {
startPage(); startPage();
if(!"88888".equals(getLoginUser().getUser().getOwnerSiteCode())) { emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
}
List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
return getDataTable(list); return getDataTable(list);
} }
@ -85,6 +80,7 @@ public class EmisCustomerUserController extends BaseController
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, EmisCustomerUser emisCustomerUser) public void export(HttpServletResponse response, EmisCustomerUser emisCustomerUser)
{ {
emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
ExcelUtil<EmisCustomerUser> util = new ExcelUtil<EmisCustomerUser>(EmisCustomerUser.class); ExcelUtil<EmisCustomerUser> util = new ExcelUtil<EmisCustomerUser>(EmisCustomerUser.class);
util.exportExcel(response, list, "快递客户用户数据"); util.exportExcel(response, list, "快递客户用户数据");
@ -108,7 +104,7 @@ public class EmisCustomerUserController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser) public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser)
{ {
emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser)); return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser));
} }

11
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -158,6 +158,17 @@
<if test="updateTime != null "> and update_time = #{updateTime}</if> <if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if> <if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if> <if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="ownerSite != null and ownerSite != ''">
<!-- 包含子网点 -->
AND owner_site in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{ownerSite} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
)
</if>
</where> </where>
order by create_time desc order by create_time desc
</select> </select>