blame | history | patch | commit | commitdiff | show whitespace
jinpengyong
2021-09-23 70a98b2b11b25c7a3b32c07cdc5043b60383220d 
 screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java


@@ -1,7 +1,5 @@


package com.moral.api.service.impl;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


@@ -9,7 +7,6 @@


import com.moral.api.entity.MonitorPoint;


import com.moral.api.entity.Organization;


import com.moral.api.entity.User;


import com.moral.api.mapper.MonitorPointMapper;


import com.moral.api.mapper.OrganizationMapper;


import com.moral.api.mapper.UserMapper;


import com.moral.api.pojo.dto.organization.OrganizationDTO;


@@ -27,17 +24,12 @@


import com.moral.pojo.CompareFieldResult;


import com.moral.util.ConvertUtils;


import com.moral.util.DateUtils;




import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.context.properties.ConfigurationProperties;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import javax.servlet.http.HttpServletRequest;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.function.Predicate;




@@ -147,7 +139,6 @@




        return organizationDTO;


    }








    /**


@@ -393,7 +384,8 @@


     * @Author: 陈凯裕


     * @Date: 2021/4/14


     */


    private List<Organization> getAllChildrenOrganization(Integer parentId) {


    @Override


    public List<Organization> getAllChildrenOrganization(Integer parentId) {


        List<Organization> children = new ArrayList<>();


        recursionQueryChildren(parentId, children);


        return children;


@@ -483,6 +475,5 @@


        String content = CompareFieldUtils.resultsConvertContent(results, "修改了组织;组织名称："+oldOrganization.getName());


        logUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);


    }






}