修改时间的bug

zhaoxiaohao

2020-11-16 f30a977b18541d2f1b9a7863b1377e5f366df9dc

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java

@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.service.impl;

import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.usercenter.model.SysArea;
import com.kidgrow.usercenter.service.ISysAreaService;
import com.kidgrow.usercenter.vo.SysCompanyVo;
@@ -34,6 +35,8 @@
public class SysCompanyServiceImpl extends SuperServiceImpl<SysCompanyMapper, SysCompany> implements ISysCompanyService {
    @Autowired
    private ISysAreaService sysAreaService;
    @Autowired
    private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
    private final  Integer SHENG=1;
    private final  Integer SHI=2;
    private final  Integer XIAN=3;
@@ -43,47 +46,11 @@
     * @return
     */
    @Override
    public PageResult<SysCompanyVo> findList(Map<String, Object> params){
    public PageResult findList(Map<String, Object> params, SysUser user){
        Page<SysCompany> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
        List<SysCompany> list  =  baseMapper.findList(page, params);
        List<SysCompanyVo> listVo=new ArrayList<>();
        list.forEach(e -> {
            SysCompanyVo vo=new SysCompanyVo();
            BeanCopier beanCopier = BeanCopier.create(SysCompany.class, SysCompanyVo.class, false);
            beanCopier.copy(e,vo,null);
            if(vo.getCompanyArea()!=null){
                SysArea byId = sysAreaService.getById(vo.getCompanyArea());
                if(byId.getAreaLeveltype()==XIAN){
                    vo.setXianId(byId.getId());
                    vo.setXian(byId.getAreaName());
                    SysArea shi = sysAreaService.getById(byId.getAreaParentId());
                    if(shi!=null){
                        vo.setShi(shi.getAreaName());
                        vo.setShiId(shi.getId());
                        SysArea sheng = sysAreaService.getById(shi.getAreaParentId());
                        if (sheng != null) {
                            vo.setSheng(sheng.getAreaName());
                            vo.setShengId(sheng.getId());
                        }
                    }
                }
                if(byId.getAreaLeveltype()==SHI){
                    vo.setShi(byId.getAreaName());
                    vo.setShiId(byId.getId());
                    SysArea sheng = sysAreaService.getById(byId.getAreaParentId());
                    if (sheng != null) {
                        vo.setSheng(sheng.getAreaName());
                        vo.setShengId(sheng.getId());
                    }
                }
                if(byId.getAreaLeveltype()==SHENG){
                    vo.setSheng(byId.getAreaName());
                    vo.setShengId(byId.getId());
                }
            }
            listVo.add(vo);
        });
        return PageResult.<SysCompanyVo>builder().data(listVo).code(0).count(page.getTotal()).build();
        return PageResult.<SysCompany>builder().data(list).code(0).count(page.getTotal()).build();
    }

    /**