冲突解决

tenant/organization/src/main/java/com/jzg/organization/entity/po/SysDept.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.util.tree.INode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDeptServiceImpl.java

@@ -179,7 +179,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     private LambdaQueryWrapper<SysDept> buildQueryWrapper(String systemCode) {
         LambdaQueryWrapper<SysDept> lqw = Wrappers.lambdaQuery();
         lqw.eq(SysDept::getSystemCode, systemCode);
-        lqw.eq(SysDept::getDelFlag, 0);
         lqw.orderByAsc(SysDept::getParentId);
         lqw.orderByAsc(SysDept::getOrderNum);
         return lqw;