修改commons工程包名

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -1,21 +1,18 @@
 package com.jzg.config;
 
-import com.jzg.constants.RedisKeyConstants;
-import com.jzg.entity.RedisToken;
+import com.jzg.commons.constants.RedisKeyConstants;
 import com.jzg.entity.SysRolePerms;
-import com.jzg.entity.SysUserRole;
 import com.jzg.entity.SysUser;
-import com.jzg.exception.SystemException;
+import com.jzg.entity.vo.SysUserJzgVo;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.service.SysUserRoleService;
 import com.jzg.service.SysUserService;
 import com.jzg.util.PasswordUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 import java.util.List;
@@ -68,6 +65,8 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
         if (!encryptedPassword.equals(byId.getPassword())) {
             throw new SystemException("用户名或密码错误");
         }
+
+
         //获取用户角色权限标识
         List<SysRolePerms> userPerms = sysUserRoleService.getUserPerms(byId.getId(), system);
 
@@ -75,19 +74,23 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
                 .map(perms -> new JzgGrantedAuthority(perms.getSysCode(),perms.getPermsId(),perms.getPerms()))
                 .collect(Collectors.toList());
 
+        if(!authorities.stream().anyMatch(x->x.getSystem().equals(system)) && !username.equals("admin")){
+            throw new SystemException("没有权限访问系统");
+        }
+
+        SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId());
+
         if (details instanceof java.util.Map) {
             java.util.Map<String, Object> detailMap = (java.util.Map<String, Object>) details;
             detailMap.put("systemcode", system);
+            detailMap.put("deptId",jzgUserInfo.getDeptId());
         } else {
             java.util.Map<String, Object> detailMap = new java.util.HashMap<>();
             detailMap.put("systemcode", system);
+            detailMap.put("deptId",jzgUserInfo.getDeptId());
             details = detailMap;
         }
 
-        if(!authorities.stream().anyMatch(x->x.getSystem().equals(system)) && !username.equals("admin")){
-            throw new SystemException("没有权限访问系统");
-        }
-
         Object finalDetails = details;
         return new UsernamePasswordAuthenticationToken(username, rawPassword, authorities) {{
             setDetails(finalDetails);

authentication/src/main/java/com/jzg/controller/AuthController.java

@@ -1,24 +1,22 @@
 package com.jzg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.config.JzgAuthentication;
 import com.jzg.config.JzgTokenService;
 import com.jzg.config.JzgUserDetailsService;
 import com.jzg.config.JzgUsernamePasswordAuthenticationToken;
-import com.jzg.constants.RedisKeyConstants;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.constants.RedisKeyConstants;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.entity.SysUser;
 import com.jzg.entity.vo.LoginFormVo;
 import com.jzg.entity.vo.ModifyPassWordFormVo;
-import com.jzg.exception.SystemException;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.handler.JzgAuthenticationSuccessHandler;
 import com.jzg.service.SysUserService;
-import com.jzg.util.ImageUtil;
+import com.jzg.commons.util.ImageUtil;
 import com.wf.captcha.SpecCaptcha;
 import com.wf.captcha.base.Captcha;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.ServletException;

authentication/src/main/java/com/jzg/entity/RedisToken.java

@@ -10,5 +10,6 @@ import java.util.List;
 public class RedisToken {
     private String username;
     private String system;
+    private String deptId;
     private List<JzgGrantedAuthority> auths;
 }

authentication/src/main/java/com/jzg/entity/SysRolePerms.java

@@ -1,7 +1,6 @@
 package com.jzg.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.jzg.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

authentication/src/main/java/com/jzg/entity/SysUser.java

@@ -1,6 +1,6 @@
 package com.jzg.entity;
 
-import com.jzg.core.base.BaseModel;
+import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

authentication/src/main/java/com/jzg/entity/vo/SysUserJzgVo.java

@@ -0,0 +1,19 @@
+package com.jzg.entity.vo;
+
+import lombok.Data;
+
+/**
+ * 晋掌柜系统用户数据
+ */
+@Data
+public class SysUserJzgVo {
+
+    private String id;
+
+    private String username;
+
+    private String mobile;
+
+    private String deptId;
+
+}

authentication/src/main/java/com/jzg/handler/JzgAuthenticationSuccessHandler.java

@@ -35,16 +35,20 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
         // 获取用户信息
         String username = authentication.getName();
+        String system = ((HashMap<String, String>) authentication.getDetails()).get("systemcode");
+        String deptId = ((HashMap<String, String>) authentication.getDetails()).get("deptId");
         RedisToken redisToken = new RedisToken();
         Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
         redisToken.setUsername(username);
         List<JzgGrantedAuthority> jzgGrantedAuthorities = authorities.stream()
+                .filter(authority -> ((JzgGrantedAuthority)authority).getSystem().equals(system)) // 过滤出系统的权限
                 .map(authority -> (JzgGrantedAuthority) authority) // 强制转换为 SimpleGrantedAuthority
                 .collect(Collectors.toList());
 
         redisToken.setAuths(jzgGrantedAuthorities);
-        String system = ((HashMap<String, String>) authentication.getDetails()).get("systemcode");
+
         redisToken.setSystem(system);
+        redisToken.setDeptId(deptId);
         String token = tokenService.generateToken(username);
         // 生成 JWT Token
         tokenService.saveToken(username,token,JSONObject.toJSONString(redisToken));

authentication/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -2,8 +2,15 @@ package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.entity.SysUser;
+import com.jzg.entity.vo.SysUserJzgVo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
+
+    /**
+     * 获取晋掌柜用户信息
+     * @return
+     */
+    public SysUserJzgVo getJzgUserInfo(String userId);
 }

authentication/src/main/java/com/jzg/service/SysUserService.java

@@ -2,6 +2,7 @@ package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.entity.SysUser;
+import com.jzg.entity.vo.SysUserJzgVo;
 import org.springframework.stereotype.Service;
 
 
@@ -14,4 +15,11 @@ public interface SysUserService extends IService<SysUser> {
      */
     public boolean register(SysUser sysUser);
 
+
+    /**
+     * 获取晋掌柜用户信息
+     * @param userId
+     * @return
+     */
+    public SysUserJzgVo getJzgUserInfo(String userId);
 }

authentication/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.jzg.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.entity.SysUser;
+import com.jzg.entity.vo.SysUserJzgVo;
 import com.jzg.mapper.SysUserMapper;
 import com.jzg.service.SysUserService;
 import org.springframework.stereotype.Service;
@@ -14,4 +15,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         boolean save = this.save(sysUser);
         return save;
     }
+
+    @Override
+    public SysUserJzgVo getJzgUserInfo(String userId) {
+        SysUserJzgVo jzgUserInfo = baseMapper.getJzgUserInfo(userId);
+        return jzgUserInfo;
+    }
 }

authentication/src/main/resources/mapper/SysUserMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.mapper.SysUserMapper">
+
+
+    <select id="getJzgUserInfo" resultType="com.jzg.entity.vo.SysUserJzgVo">
+        SELECT
+            su.*,
+            suji.dept_id
+        FROM
+            sys_user su
+                LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id
+        WHERE
+            su.id = #{userId}
+    </select>
+</mapper>

commons/src/main/java/com/jzg/annotation/IgnoreTenant.java → commons/src/main/java/com/jzg/commons/annotation/IgnoreTenant.java

@@ -1,4 +1,4 @@
-package com.jzg.annotation;
+package com.jzg.commons.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

commons/src/main/java/com/jzg/annotation/Log.java → commons/src/main/java/com/jzg/commons/annotation/Log.java

@@ -1,7 +1,7 @@
-package com.jzg.annotation;
+package com.jzg.commons.annotation;
 
-import com.jzg.entity.enums.BusinessType;
-import com.jzg.entity.enums.OperatorType;
+import com.jzg.commons.entity.enums.BusinessType;
+import com.jzg.commons.entity.enums.OperatorType;
 
 import java.lang.annotation.*;
 

commons/src/main/java/com/jzg/aop/OperatorTrajectory.java → commons/src/main/java/com/jzg/commons/aop/OperatorTrajectory.java

@@ -1,4 +1,4 @@
-package com.jzg.aop;
+package com.jzg.commons.aop;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

commons/src/main/java/com/jzg/aop/PremissionCheck.java → commons/src/main/java/com/jzg/commons/aop/PremissionCheck.java

@@ -1,4 +1,4 @@
-package com.jzg.aop;
+package com.jzg.commons.aop;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

commons/src/main/java/com/jzg/aop/aspect/OperatorTrajectoryAspect.java → commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -1,15 +1,15 @@
-package com.jzg.aop.aspect;
+package com.jzg.commons.aop.aspect;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.aop.OperatorTrajectory;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.base.HistoryDataService;
-import com.jzg.core.page.HttpResult;
-import com.jzg.exception.SystemException;
-import com.jzg.service.OperatorTrajectoryService;
-import com.jzg.util.idgen.IdGenerate;
+import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.base.HistoryDataService;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.service.OperatorTrajectoryService;
+import com.jzg.commons.util.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.*;
@@ -20,8 +20,6 @@ import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 @Aspect
@@ -42,7 +40,7 @@ public class OperatorTrajectoryAspect {
 
     private ThreadLocal<MethodContext> methodContext = new ThreadLocal<>();
 
-    @AfterReturning(pointcut = "@annotation(com.jzg.aop.OperatorTrajectory)",returning = "result")
+    @AfterReturning(pointcut = "@annotation(com.jzg.commons.aop.OperatorTrajectory)",returning = "result")
     public void doAfter(JoinPoint joinPoint, HttpResult result) {
         MethodContext context = methodContext.get();
         Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
@@ -54,7 +52,7 @@ public class OperatorTrajectoryAspect {
                 if(Objects.isNull(context.getId())){
                     throw new SystemException("线程上下文异常,请重试");
                 }
-                com.jzg.entity.po.OperatorTrajectory byId = operatorTrajectoryService.getById(context.getId());
+                com.jzg.commons.entity.po.OperatorTrajectory byId = operatorTrajectoryService.getById(context.getId());
                 if(result.getCode() == 200){
                     if(byId.getOperatorType().equals("C")){
                         JSONObject jsonObject = JSON.parseObject(result.getData().toString());
@@ -73,13 +71,13 @@ public class OperatorTrajectoryAspect {
     }
 
     //拦截异常消息
-    @AfterThrowing(pointcut = "@annotation(com.jzg.aop.OperatorTrajectory)", throwing = "ex")
+    @AfterThrowing(pointcut = "@annotation(com.jzg.commons.aop.OperatorTrajectory)", throwing = "ex")
     public void doAfterThrowing(JoinPoint joinPoint, Throwable ex) {
         MethodContext context = methodContext.get();
         if (context != null) {
             String methodName = context.getMethodName();
             if(joinPoint.getSignature().getName().equals(methodName)){
-                com.jzg.entity.po.OperatorTrajectory byId = operatorTrajectoryService.getById(context.getId());
+                com.jzg.commons.entity.po.OperatorTrajectory byId = operatorTrajectoryService.getById(context.getId());
                 byId.setExecuteStatus(2);
                 byId.setErrorMsg(ex.getMessage());
                 operatorTrajectoryService.updateById(byId);
@@ -100,7 +98,7 @@ public class OperatorTrajectoryAspect {
             id = point.getArgs()[0].toString();
         }
 
-        com.jzg.entity.po.OperatorTrajectory trajectory = new com.jzg.entity.po.OperatorTrajectory();
+        com.jzg.commons.entity.po.OperatorTrajectory trajectory = new com.jzg.commons.entity.po.OperatorTrajectory();
         String trajectoryId = IdGenerate.nextId();
         trajectory.setId(trajectoryId);
         trajectory.setOperatorType(operatorTrajectory.type());

commons/src/main/java/com/jzg/aop/aspect/PermissionAspect.java → commons/src/main/java/com/jzg/commons/aop/aspect/PermissionAspect.java

@@ -1,26 +1,22 @@
-package com.jzg.aop.aspect;
+package com.jzg.commons.aop.aspect;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.aop.PremissionCheck;
-import com.jzg.constants.RedisKeyConstants;
-import com.jzg.exception.SystemException;
+import com.jzg.commons.aop.PremissionCheck;
+import com.jzg.commons.constants.RedisKeyConstants;
+import com.jzg.commons.exception.SystemException;
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.tomcat.util.http.fileupload.RequestContext;
-import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 

commons/src/main/java/com/jzg/aop/aspect/TenantAspect.java → commons/src/main/java/com/jzg/commons/aop/aspect/TenantAspect.java

@@ -1,6 +1,6 @@
-package com.jzg.aop.aspect;
+package com.jzg.commons.aop.aspect;
 
-import com.jzg.core.base.TenantContext;
+import com.jzg.commons.core.base.TenantContext;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class TenantAspect {
 
-    @Around("@annotation(com.jzg.annotation.IgnoreTenant)")
+    @Around("@annotation(com.jzg.commons.annotation.IgnoreTenant)")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
         try {
             TenantContext.setInternalInvocation(true);

commons/src/main/java/com/jzg/config/DataPermissionInterceptor.java → commons/src/main/java/com/jzg/commons/config/DataPermissionInterceptor.java

@@ -1,4 +1,4 @@
-package com.jzg.config;
+package com.jzg.commons.config;
 
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import org.apache.ibatis.executor.Executor;

commons/src/main/java/com/jzg/config/MultiTenantHandler.java → commons/src/main/java/com/jzg/commons/config/MultiTenantHandler.java

@@ -1,9 +1,9 @@
-package com.jzg.config;
+package com.jzg.commons.config;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.base.TenantContext;
-import com.jzg.entity.properties.TenantProperties;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.base.TenantContext;
+import com.jzg.commons.entity.properties.TenantProperties;
 import jodd.util.StringUtil;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;

commons/src/main/java/com/jzg/config/MyBatisMetaObjectHandler.java → commons/src/main/java/com/jzg/commons/config/MyBatisMetaObjectHandler.java

@@ -1,7 +1,7 @@
-package com.jzg.config;
+package com.jzg.commons.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.jzg.core.base.BaseController;
+import com.jzg.commons.core.base.BaseController;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

commons/src/main/java/com/jzg/config/MyBatisPlusConfig.java → commons/src/main/java/com/jzg/commons/config/MyBatisPlusConfig.java

@@ -1,11 +1,11 @@
-package com.jzg.config;
+package com.jzg.commons.config;
 
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.jzg.core.base.BaseController;
-import com.jzg.entity.properties.TenantProperties;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.entity.properties.TenantProperties;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -37,6 +37,8 @@ public class MyBatisPlusConfig {
 
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor(TenantProperties tenantProperties) {
+
+
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         //配置拦截器
         if (Boolean.TRUE.equals(tenantProperties.getEnable())) {

commons/src/main/java/com/jzg/config/RedissonConfig.java → commons/src/main/java/com/jzg/commons/config/RedissonConfig.java

@@ -1,10 +1,11 @@
-package com.jzg.config;
+package com.jzg.commons.config;
 
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.codec.JsonJacksonCodec;
 import org.redisson.config.Config;
 import org.redisson.config.SingleServerConfig;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

commons/src/main/java/com/jzg/config/SwaggerConfig.java → commons/src/main/java/com/jzg/commons/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.jzg.config;
+package com.jzg.commons.config;
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;

commons/src/main/java/com/jzg/constants/Constants.java → commons/src/main/java/com/jzg/commons/constants/Constants.java

@@ -1,4 +1,4 @@
-package com.jzg.constants;
+package com.jzg.commons.constants;
 
 import java.util.Locale;
 

commons/src/main/java/com/jzg/constants/RedisKeyConstants.java → commons/src/main/java/com/jzg/commons/constants/RedisKeyConstants.java

@@ -1,4 +1,4 @@
-package com.jzg.constants;
+package com.jzg.commons.constants;
 
 public class RedisKeyConstants {
 

commons/src/main/java/com/jzg/core/base/BaseController.java → commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -1,9 +1,9 @@
-package com.jzg.core.base;
+package com.jzg.commons.core.base;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.exception.SystemException;
+import com.jzg.commons.exception.SystemException;
 import jakarta.servlet.http.HttpServletRequest;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,4 +70,20 @@ public class BaseController {
         return userPerms;
     }
 
+    /**
+     * 获取用户机构id
+     * @return
+     */
+    public String getUserDeptId(){
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        String authorizationHeader = request.getHeader("Authorization");
+        if(Objects.isNull(authorizationHeader) || Objects.isNull(redissonClient.getBucket(authorizationHeader).get())){
+            throw new SystemException("用户登录信息过期");
+        }
+        String userJsonStr = redissonClient.getBucket(authorizationHeader).get().toString();
+        JSONObject userInfo = JSONObject.parseObject(userJsonStr);
+        return userInfo.getString("deptId");
+    }
+
 }

commons/src/main/java/com/jzg/core/base/BaseModel.java → commons/src/main/java/com/jzg/commons/core/base/BaseModel.java

@@ -1,4 +1,4 @@
-package com.jzg.core.base;
+package com.jzg.commons.core.base;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

commons/src/main/java/com/jzg/core/base/HistoryDataService.java → commons/src/main/java/com/jzg/commons/core/base/HistoryDataService.java

@@ -1,8 +1,6 @@
-package com.jzg.core.base;
+package com.jzg.commons.core.base;
 
 
-import com.jzg.core.page.HttpResult;
-
 public interface HistoryDataService {
 
     public Object getHistoryData(String id);

commons/src/main/java/com/jzg/core/base/PageRequest.java → commons/src/main/java/com/jzg/commons/core/base/PageRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.core.base;
+package com.jzg.commons.core.base;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;

commons/src/main/java/com/jzg/core/base/TenantContext.java → commons/src/main/java/com/jzg/commons/core/base/TenantContext.java

@@ -1,4 +1,4 @@
-package com.jzg.core.base;
+package com.jzg.commons.core.base;
 
 /**
  * 租户上下文

commons/src/main/java/com/jzg/core/page/HttpResult.java → commons/src/main/java/com/jzg/commons/core/page/HttpResult.java

@@ -1,4 +1,4 @@
-package com.jzg.core.page;
+package com.jzg.commons.core.page;
 
 
 

commons/src/main/java/com/jzg/core/page/HttpStatus.java → commons/src/main/java/com/jzg/commons/core/page/HttpStatus.java

@@ -1,4 +1,4 @@
-package com.jzg.core.page;
+package com.jzg.commons.core.page;
 
 /**
  * Constants enumerating the HTTP status codes.

commons/src/main/java/com/jzg/entity/enums/BusinessStatus.java → commons/src/main/java/com/jzg/commons/entity/enums/BusinessStatus.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.enums;
+package com.jzg.commons.entity.enums;
 
 /**
  * 操作状态

commons/src/main/java/com/jzg/entity/enums/BusinessType.java → commons/src/main/java/com/jzg/commons/entity/enums/BusinessType.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.enums;
+package com.jzg.commons.entity.enums;
 
 /**
  * 业务操作类型

commons/src/main/java/com/jzg/entity/enums/HttpMethod.java → commons/src/main/java/com/jzg/commons/entity/enums/HttpMethod.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.enums;
+package com.jzg.commons.entity.enums;
 
 import org.springframework.lang.Nullable;
 

commons/src/main/java/com/jzg/entity/enums/OperatorType.java → commons/src/main/java/com/jzg/commons/entity/enums/OperatorType.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.enums;
+package com.jzg.commons.entity.enums;
 
 /**
  * 操作人类别

commons/src/main/java/com/jzg/entity/po/OperatorTrajectory.java → commons/src/main/java/com/jzg/commons/entity/po/OperatorTrajectory.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.po;
+package com.jzg.commons.entity.po;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

commons/src/main/java/com/jzg/entity/properties/TenantProperties.java → commons/src/main/java/com/jzg/commons/entity/properties/TenantProperties.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.properties;
+package com.jzg.commons.entity.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

commons/src/main/java/com/jzg/entity/vo/RolePermissionVo.java → commons/src/main/java/com/jzg/commons/entity/vo/RolePermissionVo.java

@@ -1,4 +1,4 @@
-package com.jzg.entity.vo;
+package com.jzg.commons.entity.vo;
 
 import lombok.Data;
 

commons/src/main/java/com/jzg/exception/GlobalExceptionHandler.java → commons/src/main/java/com/jzg/commons/exception/GlobalExceptionHandler.java

@@ -1,6 +1,6 @@
-package com.jzg.exception;
+package com.jzg.commons.exception;
 
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.page.HttpResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;

commons/src/main/java/com/jzg/exception/SystemException.java → commons/src/main/java/com/jzg/commons/exception/SystemException.java

@@ -1,4 +1,4 @@
-package com.jzg.exception;
+package com.jzg.commons.exception;
 
 
 public class SystemException extends RuntimeException {

commons/src/main/java/com/jzg/exception/ValidateException.java → commons/src/main/java/com/jzg/commons/exception/ValidateException.java

@@ -1,4 +1,4 @@
-package com.jzg.exception;
+package com.jzg.commons.exception;
 
 
 public class ValidateException extends RuntimeException {

commons/src/main/java/com/jzg/filter/PropertyPreExcludeFilter.java → commons/src/main/java/com/jzg/commons/filter/PropertyPreExcludeFilter.java

@@ -1,4 +1,4 @@
-package com.jzg.filter;
+package com.jzg.commons.filter;
 
 import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
 

commons/src/main/java/com/jzg/mapper/OperatorTrajectoryMapper.java → commons/src/main/java/com/jzg/commons/mapper/OperatorTrajectoryMapper.java

@@ -1,7 +1,7 @@
-package com.jzg.mapper;
+package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.entity.po.OperatorTrajectory;
+import com.jzg.commons.entity.po.OperatorTrajectory;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

commons/src/main/java/com/jzg/service/OperatorTrajectoryService.java → commons/src/main/java/com/jzg/commons/service/OperatorTrajectoryService.java

@@ -1,10 +1,8 @@
-package com.jzg.service;
+package com.jzg.commons.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.entity.po.OperatorTrajectory;
-
-import java.util.List;
+import com.jzg.commons.entity.po.OperatorTrajectory;
 
 /**
  * 操作日志 服务层

commons/src/main/java/com/jzg/commons/service/impl/OperatorTrajectoryServiceImpl.java

@@ -0,0 +1,12 @@
+package com.jzg.commons.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.OperatorTrajectory;
+import com.jzg.commons.mapper.OperatorTrajectoryMapper;
+import com.jzg.commons.service.OperatorTrajectoryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OperatorTrajectoryServiceImpl extends ServiceImpl<OperatorTrajectoryMapper, OperatorTrajectory> implements OperatorTrajectoryService {
+
+}

commons/src/main/java/com/jzg/text/CharsetKit.java → commons/src/main/java/com/jzg/commons/text/CharsetKit.java

@@ -1,7 +1,7 @@
-package com.jzg.text;
+package com.jzg.commons.text;
 
 
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.StringUtils;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;

commons/src/main/java/com/jzg/text/Convert.java → commons/src/main/java/com/jzg/commons/text/Convert.java

@@ -1,6 +1,6 @@
-package com.jzg.text;
+package com.jzg.commons.text;
 
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.math.BigDecimal;

commons/src/main/java/com/jzg/text/StrFormatter.java → commons/src/main/java/com/jzg/commons/text/StrFormatter.java

@@ -1,6 +1,6 @@
-package com.jzg.text;
+package com.jzg.commons.text;
 
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.StringUtils;
 
 /**
  * 字符串格式化

commons/src/main/java/com/jzg/util/AssertionUtils.java → commons/src/main/java/com/jzg/commons/util/AssertionUtils.java

@@ -1,6 +1,6 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
-import com.jzg.exception.SystemException;
+import com.jzg.commons.exception.SystemException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.ObjectUtils;
 

commons/src/main/java/com/jzg/util/FileUtils.java → commons/src/main/java/com/jzg/commons/util/FileUtils.java

@@ -1,4 +1,4 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
 import org.springframework.web.multipart.MultipartFile;
 

commons/src/main/java/com/jzg/util/ImageUtil.java → commons/src/main/java/com/jzg/commons/util/ImageUtil.java

@@ -1,4 +1,4 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

commons/src/main/java/com/jzg/util/LogUtils.java → commons/src/main/java/com/jzg/commons/util/LogUtils.java

@@ -1,4 +1,4 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
 /**
  * 处理并记录日志文件

commons/src/main/java/com/jzg/util/ServletUtils.java → commons/src/main/java/com/jzg/commons/util/ServletUtils.java

@@ -1,4 +1,4 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -7,8 +7,8 @@ import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import com.jzg.constants.Constants;
-import com.jzg.text.Convert;
+import com.jzg.commons.constants.Constants;
+import com.jzg.commons.text.Convert;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

commons/src/main/java/com/jzg/util/StringUtils.java → commons/src/main/java/com/jzg/commons/util/StringUtils.java

@@ -1,7 +1,7 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
-import com.jzg.constants.Constants;
-import com.jzg.text.StrFormatter;
+import com.jzg.commons.constants.Constants;
+import com.jzg.commons.text.StrFormatter;
 import org.springframework.util.AntPathMatcher;
 
 import java.util.*;

commons/src/main/java/com/jzg/util/Threads.java → commons/src/main/java/com/jzg/commons/util/Threads.java

@@ -1,4 +1,4 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

commons/src/main/java/com/jzg/util/TreeBuildUtils.java → commons/src/main/java/com/jzg/commons/util/TreeBuildUtils.java

@@ -1,11 +1,11 @@
-package com.jzg.util;
+package com.jzg.commons.util;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.lang.tree.parser.NodeParser;
-import com.jzg.util.reflect.ReflectUtils;
+import com.jzg.commons.util.reflect.ReflectUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

commons/src/main/java/com/jzg/util/http/HttpHelper.java → commons/src/main/java/com/jzg/commons/util/http/HttpHelper.java

@@ -1,4 +1,4 @@
-package com.jzg.util.http;
+package com.jzg.commons.util.http;
 
 import jakarta.servlet.ServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;

commons/src/main/java/com/jzg/util/http/HttpUtils.java → commons/src/main/java/com/jzg/commons/util/http/HttpUtils.java

@@ -1,7 +1,7 @@
-package com.jzg.util.http;
+package com.jzg.commons.util.http;
 
-import com.jzg.constants.Constants;
-import com.jzg.util.StringUtils;
+import com.jzg.commons.constants.Constants;
+import com.jzg.commons.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

commons/src/main/java/com/jzg/util/idgen/IdGenerate.java → commons/src/main/java/com/jzg/commons/util/idgen/IdGenerate.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jzg.util.idgen;
+package com.jzg.commons.util.idgen;
 
 
 import java.security.SecureRandom;

commons/src/main/java/com/jzg/util/idgen/IdWorker.java → commons/src/main/java/com/jzg/commons/util/idgen/IdWorker.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jzg.util.idgen;
+package com.jzg.commons.util.idgen;
 
 
 import java.util.Random;

commons/src/main/java/com/jzg/util/ip/AddressUtils.java → commons/src/main/java/com/jzg/commons/util/ip/AddressUtils.java

@@ -1,10 +1,10 @@
-package com.jzg.util.ip;
+package com.jzg.commons.util.ip;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.jzg.constants.Constants;
-import com.jzg.util.StringUtils;
-import com.jzg.util.http.HttpUtils;
+import com.jzg.commons.constants.Constants;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.http.HttpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

commons/src/main/java/com/jzg/util/ip/IpUtils.java → commons/src/main/java/com/jzg/commons/util/ip/IpUtils.java

@@ -1,8 +1,8 @@
-package com.jzg.util.ip;
+package com.jzg.commons.util.ip;
 
 
-import com.jzg.util.ServletUtils;
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.ServletUtils;
+import com.jzg.commons.util.StringUtils;
 import jakarta.servlet.http.HttpServletRequest;
 
 import java.net.InetAddress;

commons/src/main/java/com/jzg/util/reflect/ReflectUtils.java → commons/src/main/java/com/jzg/commons/util/reflect/ReflectUtils.java

@@ -1,7 +1,7 @@
-package com.jzg.util.reflect;
+package com.jzg.commons.util.reflect;
 
 import cn.hutool.core.util.ReflectUtil;
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

commons/src/main/java/com/jzg/util/spring/SpringUtils.java → commons/src/main/java/com/jzg/commons/util/spring/SpringUtils.java

@@ -1,6 +1,6 @@
-package com.jzg.util.spring;
+package com.jzg.commons.util.spring;
 
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;

commons/src/main/java/com/jzg/config/ThreadPoolConfig.java

@@ -1,6 +1,6 @@
 package com.jzg.config;
 
-import com.jzg.util.Threads;
+import com.jzg.commons.util.Threads;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

commons/src/main/java/com/jzg/service/impl/OperatorTrajectoryServiceImpl.java

@@ -1,16 +0,0 @@
-package com.jzg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.core.base.HistoryDataService;
-import com.jzg.core.page.HttpResult;
-import com.jzg.entity.po.OperatorTrajectory;
-import com.jzg.mapper.OperatorTrajectoryMapper;
-import com.jzg.service.OperatorTrajectoryService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class OperatorTrajectoryServiceImpl extends ServiceImpl<OperatorTrajectoryMapper, OperatorTrajectory> implements OperatorTrajectoryService {
-
-}

platform/src/main/java/com/jzg/aop/aspect/LogAspect.java

@@ -1,18 +1,17 @@
 package com.jzg.aop.aspect;
 
 import com.alibaba.fastjson2.JSON;
-import com.jzg.annotation.Log;
-import com.jzg.core.base.BaseController;
-import com.jzg.entity.enums.BusinessStatus;
-import com.jzg.entity.enums.HttpMethod;
+import com.jzg.commons.annotation.Log;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.entity.enums.BusinessStatus;
+import com.jzg.commons.entity.enums.HttpMethod;
 import com.jzg.entity.po.SysOperLog;
-import com.jzg.filter.PropertyPreExcludeFilter;
+import com.jzg.commons.filter.PropertyPreExcludeFilter;
 import com.jzg.manager.AsyncManager;
 import com.jzg.manager.factory.AsyncFactory;
-import com.jzg.mapper.SysOperLogMapper;
-import com.jzg.util.ip.IpUtils;
-import com.jzg.util.ServletUtils;
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.ip.IpUtils;
+import com.jzg.commons.util.ServletUtils;
+import com.jzg.commons.util.StringUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;

platform/src/main/java/com/jzg/controller/FileUploadController.java

@@ -1,12 +1,12 @@
 package com.jzg.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.entity.po.SysUploadFiles;
 import com.jzg.mapper.SysUploadFilesMapper;
-import com.jzg.util.FileUtils;
-import com.jzg.util.idgen.IdGenerate;
+import com.jzg.commons.util.FileUtils;
+import com.jzg.commons.util.idgen.IdGenerate;
 import io.minio.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -1,20 +1,17 @@
 package com.jzg.controller;
 
-import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.annotation.Log;
-import com.jzg.core.page.HttpResult;
-import com.jzg.entity.enums.BusinessType;
-import com.jzg.entity.vo.SysRoleVo;
+import com.jzg.commons.annotation.Log;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.enums.BusinessType;
 import com.jzg.entity.vo.SysSystemPermsVo;
 import com.jzg.entity.vo.SysSystemVo;
 import com.jzg.service.SysSystemService;
-import com.jzg.util.AssertionUtils;
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.AssertionUtils;
+import com.jzg.commons.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.NotEmpty;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

platform/src/main/java/com/jzg/controller/SysUserController.java

@@ -1,9 +1,8 @@
 package com.jzg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.page.HttpResult;
-import com.jzg.entity.vo.SysSystemVo;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.entity.vo.SysUserVo;
 import com.jzg.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -1,28 +1,21 @@
 package com.jzg.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.aop.PremissionCheck;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.entity.po.SysRole;
-import com.jzg.entity.vo.RolePermissionVo;
 import com.jzg.entity.vo.SysRoleVo;
-import com.jzg.exception.SystemException;
-import com.jzg.exception.ValidateException;
+import com.jzg.commons.exception.ValidateException;
 import com.jzg.service.UserRoleService;
-import com.jzg.util.StringUtils;
+import com.jzg.commons.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 用户角色管理
  */

platform/src/main/java/com/jzg/entity/po/SysRole.java

@@ -2,7 +2,7 @@ package com.jzg.entity.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.jzg.core.base.BaseModel;
+import com.jzg.commons.core.base.BaseModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

platform/src/main/java/com/jzg/entity/po/SysSystem.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.jzg.core.base.BaseModel;
+import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

platform/src/main/java/com/jzg/entity/po/SysUser.java

@@ -1,6 +1,6 @@
 package com.jzg.entity.po;
 
-import com.jzg.core.base.BaseModel;
+import com.jzg.commons.core.base.BaseModel;
 import com.jzg.entity.vo.SysSystemVo;
 import com.jzg.util.PasswordUtils;
 import io.swagger.v3.oas.annotations.media.Schema;

platform/src/main/java/com/jzg/entity/vo/SysRoleVo.java

@@ -1,6 +1,6 @@
 package com.jzg.entity.vo;
 
-import com.jzg.core.base.PageRequest;
+import com.jzg.commons.core.base.PageRequest;
 import com.jzg.entity.po.SysRole;
 import com.jzg.entity.po.SysRolePerms;
 import io.swagger.v3.oas.annotations.media.Schema;

platform/src/main/java/com/jzg/entity/vo/SysSystemVo.java

@@ -1,6 +1,6 @@
 package com.jzg.entity.vo;
 
-import com.jzg.core.base.PageRequest;
+import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;

platform/src/main/java/com/jzg/entity/vo/SysUserVo.java

@@ -1,6 +1,6 @@
 package com.jzg.entity.vo;
 
-import com.jzg.core.base.PageRequest;
+import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

platform/src/main/java/com/jzg/event/PlatFormApplicationLister.java

@@ -1,8 +1,8 @@
 package com.jzg.event;
 
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.constants.RedisKeyConstants;
-import com.jzg.entity.vo.RolePermissionVo;
+import com.jzg.commons.constants.RedisKeyConstants;
+import com.jzg.commons.entity.vo.RolePermissionVo;
 import com.jzg.service.UserRoleService;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;

platform/src/main/java/com/jzg/manager/AsyncManager.java

@@ -1,7 +1,7 @@
 package com.jzg.manager;
 
-import com.jzg.util.Threads;
-import com.jzg.util.spring.SpringUtils;
+import com.jzg.commons.util.Threads;
+import com.jzg.commons.util.spring.SpringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.TimerTask;

platform/src/main/java/com/jzg/manager/factory/AsyncFactory.java

@@ -3,8 +3,8 @@ package com.jzg.manager.factory;
 import com.jzg.entity.po.SysOperLog;
 import com.jzg.service.SysOperLogService;
 import com.jzg.service.impl.SysOperLogServiceImpl;
-import com.jzg.util.ip.AddressUtils;
-import com.jzg.util.spring.SpringUtils;
+import com.jzg.commons.util.ip.AddressUtils;
+import com.jzg.commons.util.spring.SpringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

platform/src/main/java/com/jzg/mapper/SysRoleMapper.java

@@ -2,8 +2,7 @@ package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.entity.po.SysRole;
-import com.jzg.entity.po.SysUserRole;
-import com.jzg.entity.vo.RolePermissionVo;
+import com.jzg.commons.entity.vo.RolePermissionVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -1,7 +1,6 @@
 package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jzg.core.page.HttpResult;
 import com.jzg.entity.po.SysSystem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.entity.po.SysSystemPerms;
@@ -11,8 +10,6 @@ import jakarta.validation.constraints.NotEmpty;
 
 import java.util.List;
 
-import java.util.List;
-
 /**
  * 租户管理表服务层 sys_system
  *

platform/src/main/java/com/jzg/service/UserRoleService.java

@@ -2,7 +2,7 @@ package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.entity.po.SysRole;
-import com.jzg.entity.vo.RolePermissionVo;
+import com.jzg.commons.entity.vo.RolePermissionVo;
 import com.jzg.entity.vo.SysRoleVo;
 
 import java.util.List;

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.entity.po.*;
 import com.jzg.entity.vo.SysSystemPermsVo;
 import com.jzg.entity.vo.SysSystemVo;
-import com.jzg.exception.SystemException;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.mapper.*;
 import com.jzg.service.SysSystemService;
 import com.jzg.util.PasswordUtils;
-import com.jzg.util.StringUtils;
-import com.jzg.util.idgen.IdGenerate;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -5,20 +5,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.entity.po.SysRole;
 import com.jzg.entity.po.SysUser;
-import com.jzg.entity.po.SysUserRole;
 import com.jzg.entity.vo.SysUserVo;
 import com.jzg.mapper.SysRoleMapper;
 import com.jzg.mapper.SysUserMapper;
-import com.jzg.mapper.SysUserRoleMapper;
 import com.jzg.service.SysUserService;
-import com.jzg.util.StringUtils;
-import jodd.util.CollectionUtil;
+import com.jzg.commons.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -2,29 +2,26 @@ package com.jzg.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.annotation.IgnoreTenant;
+import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.entity.po.SysRole;
 import com.jzg.entity.po.SysRolePerms;
-import com.jzg.entity.po.SysSystem;
 import com.jzg.entity.po.SysUserRole;
-import com.jzg.entity.vo.RolePermissionVo;
+import com.jzg.commons.entity.vo.RolePermissionVo;
 import com.jzg.entity.vo.SysRoleVo;
-import com.jzg.exception.SystemException;
-import com.jzg.exception.ValidateException;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.mapper.SysMenuMapper;
 import com.jzg.mapper.SysRoleMapper;
 import com.jzg.mapper.SysRolePermsMapper;
 import com.jzg.mapper.SysUserRoleMapper;
 import com.jzg.service.SysSystemService;
 import com.jzg.service.UserRoleService;
-import com.jzg.util.idgen.IdGenerate;
+import com.jzg.commons.util.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @Service
 public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements UserRoleService {

platform/src/main/resources/mapper/SysRoleMapper.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.mapper.SysRoleMapper">
-    <resultMap id="RoleMenuMap" type="com.jzg.entity.vo.RolePermissionVo">
+    <resultMap id="RoleMenuMap" type="com.jzg.commons.entity.vo.RolePermissionVo">
         <result column="id" property="id"/>
         <result column="systemCode" property="systemCode"/>
         <result column="systemName" property="systemName"/>
 
-        <collection property="roleVos" ofType="com.jzg.entity.vo.RolePermissionVo$RoleVo">
+        <collection property="roleVos" ofType="com.jzg.commons.entity.vo.RolePermissionVo$RoleVo">
             <result column="roleId" property="id"/>
             <result column="roleName" property="name"/>
             <result column="remark" property="remark"/>
 
-            <collection property="permVos" ofType="com.jzg.entity.vo.RolePermissionVo$RolePermsVo">
+            <collection property="permVos" ofType="com.jzg.commons.entity.vo.RolePermissionVo$RolePermsVo">
                 <result column="perms" property="perms"/>
                 <result column="permsId" property="permsId"/>
             </collection>

tenant/openfeign/src/main/java/com/jzg/openfeign/client/TestClient.java

@@ -1,10 +1,9 @@
 package com.jzg.openfeign.client;
 
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.openfeign.config.FeignConfig;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 
 @FeignClient(name="test-server",url = "http://localhost:8081/",configuration = FeignConfig.class)
 public interface TestClient {

tenant/organization/pom.xml

@@ -7,7 +7,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>organization</artifactId>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>organization Maven Webapp</name>
     <url>http://maven.apache.org</url>
     <dependencies>

tenant/organization/src/main/java/com/jzg/organization/OrganizationApplication.java

@@ -1,13 +1,15 @@
 package com.jzg.organization;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.redisson.spring.starter.RedissonAutoConfiguration;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@ComponentScan(basePackages = "com.jzg")
-@MapperScan("com.jzg")
+@ComponentScan(basePackages = {"com.jzg.commons","com.jzg.organization"})
+@MapperScan({"com.jzg.organization.mapper","com.jzg.commons.mapper"})
 public class OrganizationApplication {
     public static void main(String[] args) {
         SpringApplication.run(OrganizationApplication.class, args);

tenant/organization/src/main/java/com/jzg/organization/controller/DeptController.java

@@ -1,62 +1,67 @@
 package com.jzg.organization.controller;
 
-import cn.hutool.core.lang.tree.Tree;
-import com.jzg.core.base.BaseController;
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.organization.entity.po.SysDept;
 import com.jzg.organization.entity.vo.SysDeptVo;
-import com.jzg.organization.service.DeptService;
+import com.jzg.organization.service.SysDeptService;
 import io.swagger.v3.oas.annotations.Operation;
-import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * 机构管理接口
+ */
 @RestController
 @RequestMapping("/dept")
 public class DeptController extends BaseController {
-    @Resource
-    private DeptService deptService;
-
+    @Autowired
+    private SysDeptService sysDeptService;
 
     @Operation(summary = "新增机构接口", description = "新增机构接口")
     @PostMapping(value = "/add")
     public HttpResult<Boolean> addDept(@RequestBody SysDeptVo sysDeptVo) {
-        deptService.addDept(sysDeptVo);
+        sysDeptService.addDept(sysDeptVo);
         return HttpResult.ok();
     }
 
+    @Operation(summary = "修改机构接口", description = "修改机构接口")
     @PostMapping(value = "/update")
     public HttpResult updateDept(@RequestBody SysDept sysDept) {
-        SysDept byId = deptService.getById(sysDept.getId());
+        SysDept byId = sysDeptService.getById(sysDept.getId());
         if (sysDept.getManagementSource() != null){
             if (!sysDept.getManagementSource().equals(byId.getManagementSource())) {
                 return HttpResult.error("机构已被设置来源无法修改");
             }
         }
-        deptService.updateDept(sysDept);
+        sysDeptService.updateDept(sysDept);
         return HttpResult.ok();
     }
 
+    @Operation(summary = "删除机构接口", description = "删除机构接口")
     @PostMapping(value = "/delete")
     public HttpResult deleteDept(@RequestBody SysDeptVo sysDeptVo) {
-        return deptService.deleteDept(sysDeptVo);
+        return sysDeptService.deleteDept(sysDeptVo);
     }
 
     @PostMapping(value = "/batchLeader")
     public HttpResult batchLeader(@RequestBody SysDeptVo sysDeptVo) {
-        return deptService.batchLeader(sysDeptVo);
+        return sysDeptService.batchLeader(sysDeptVo);
     }
 
     @PostMapping(value = "/batchDeleteDept")
     public HttpResult batchDeleteDept(@RequestBody SysDeptVo sysDeptVo) {
-        return deptService.batchDeleteDept(sysDeptVo);
+        return sysDeptService.batchDeleteDept(sysDeptVo);
     }
 
+    @Operation(summary = "机构树形查询")
     @PostMapping(value = "/getDeptTree")
     public HttpResult<List<SysDept>> getDeptTree(){
-        String deptId = getUserName();
-        return HttpResult.ok(deptService.getDeptTree(deptId));
+        String deptId = getUserDeptId();
+
+        return HttpResult.ok(sysDeptService.getDeptTree(deptId));
     }
 
 
@@ -66,7 +71,7 @@ public class DeptController extends BaseController {
     @Operation(summary = "租户机构树形查询")
     @GetMapping("/deptTree")
     public HttpResult deptTree(String systemCode) {
-        return HttpResult.ok(deptService.selectDeptTreeList(systemCode));
+        return HttpResult.ok(sysDeptService.selectDeptTreeList(systemCode));
     }
 
 }

tenant/organization/src/main/java/com/jzg/organization/controller/TestController.java

@@ -1,7 +1,7 @@
 package com.jzg.organization.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.openfeign.client.TestClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,12 +12,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/tenant")
 public class TestController {
 
-    @Autowired
-    TestClient testClient;
-
-    @GetMapping(value = "aa")
-    public String aa(){
-        HttpResult userPer = testClient.getUserPer();
-        return JSONObject.toJSONString(userPer);
-    }
+//    @Autowired
+//    TestClient testClient;
+//
+//    @GetMapping(value = "aa")
+//    public String aa(){
+//        HttpResult userPer = testClient.getUserPer();
+//        return JSONObject.toJSONString(userPer);
+//    }
 }

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

@@ -0,0 +1,9 @@
+package com.jzg.organization.entity.po;
+
+import lombok.Data;
+
+@Data
+public class SysUser {
+
+    private String id;
+}

tenant/organization/src/main/java/com/jzg/organization/service/DeptService.java → tenant/organization/src/main/java/com/jzg/organization/service/SysDeptService.java

@@ -2,13 +2,15 @@ package com.jzg.organization.service;
 
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.core.page.HttpResult;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.organization.entity.po.SysDept;
 import com.jzg.organization.entity.vo.SysDeptVo;
 
 import java.util.List;
 
-public interface DeptService extends IService<SysDept> {
+public interface SysDeptService extends IService<SysDept> {
+
+    public int test();
     /**
      * 新增机构
      */

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

@@ -5,17 +5,16 @@ import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.annotation.IgnoreTenant;
-import com.jzg.core.page.HttpResult;
-import com.jzg.exception.SystemException;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.organization.entity.po.SysDept;
 import com.jzg.organization.entity.vo.SysDeptVo;
 import com.jzg.organization.mapper.SysDeptMapper;
-import com.jzg.organization.service.DeptService;
-import com.jzg.util.AssertionUtils;
-import com.jzg.util.TreeBuildUtils;
-import lombok.extern.slf4j.Slf4j;
+import com.jzg.organization.service.SysDeptService;
+import com.jzg.commons.util.AssertionUtils;
+import com.jzg.commons.util.TreeBuildUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -24,8 +23,16 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
-@Slf4j
-public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements DeptService {
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements SysDeptService {
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Override
+    public int test() {
+        return 0;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public SysDeptVo addDept(SysDeptVo sysDeptVo) {
@@ -41,7 +48,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
         } else if (comlevel.equals("3")) {
             AssertionUtils.isStringEmpty(sysDept.getCity(), "三级机构市必填");
             number = sysDept.getCity().substring(0, 4);
-            String maxId = baseMapper.getMaxId(parentId, sysDeptVo.getDeptType(), comlevel);
+            String maxId = sysDeptMapper.getMaxId(parentId, sysDeptVo.getDeptType(), comlevel);
             if (!maxId.equals("0")) {
                 String substring = maxId.substring(sysDept.getParentId().length() + 1);
                 int i = Integer.parseInt("1" + substring) + 1;
@@ -52,7 +59,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
         } else if (comlevel.equals("4")) {
             AssertionUtils.isStringEmpty(sysDept.getArea(), "四级机构区必填");
             number = sysDept.getArea().substring(0, 6);
-            String maxId = baseMapper.getMaxId(parentId, sysDeptVo.getDeptType(), comlevel);
+            String maxId = sysDeptMapper.getMaxId(parentId, sysDeptVo.getDeptType(), comlevel);
             if (!maxId.equals("0")) {
                 String substring = maxId.substring(sysDept.getParentId().length() + 1);
                 int i = Integer.parseInt("1" + substring) + 1;
@@ -70,7 +77,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
                 deptType = "M";
             }
 
-            String maxId = baseMapper.getMaxId(parentId, deptType, comlevel);
+            String maxId = sysDeptMapper.getMaxId(parentId, deptType, comlevel);
             if (!maxId.equals("0")) {
                 String substring = maxId.substring(sysDept.getParentId().length() + 1);
                 int i = Integer.parseInt("1" + substring) + 1;
@@ -94,7 +101,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
         if (!ObjectUtils.isEmpty(dept)) {
             throw new SystemException("机构编号为:" + dept.getId() + " " + dept.getName() + "已被占用");
         }
-        SysDept parentDept = baseMapper.selectById(sysDept.getParentId());
+        SysDept parentDept = sysDeptMapper.selectById(sysDept.getParentId());
 
         if (parentDept.getComLevel().equals("5")) {
             sysDept.setManagementSource(parentDept.getManagementSource());
@@ -105,7 +112,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
         qw.eq(SysDept::getDelFlag, 0);  // 删除标志为未删除
         qw.eq(SysDept::getParentId, sysDept.getParentId()); // 父级部门ID相同
         qw.eq(SysDept::getOrderNum, sysDept.getOrderNum());  // 排序号相同
-        boolean exists = baseMapper.exists(qw);
+        boolean exists = sysDeptMapper.exists(qw);
 
         if (exists) {
             // 如果存在，查询该父级部门下排序号大于当前部门的部门列表
@@ -121,7 +128,6 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
             });
         }
         boolean b = save(sysDept);
-        log.info("------------------添加部门成功-----------------------");
         AssertionUtils.isSucceed(b, "删除失败");
         sysDeptVo.setId(sysDept.getId());
         return sysDeptVo;
@@ -135,10 +141,10 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
         qw.eq(SysDept::getDelFlag, 0);  // 删除标志为未删除
         qw.eq(SysDept::getParentId, sysDeptVo.getParentId()); // 父级部门ID相同
         qw.eq(SysDept::getOrderNum, sysDeptVo.getOrderNum());  // 排序号相同
-        boolean exists = baseMapper.exists(qw);
+        boolean exists = sysDeptMapper.exists(qw);
         //不存在则直接修改
         if (!exists) {
-            baseMapper.updateById(sysDeptVo);
+            sysDeptMapper.updateById(sysDeptVo);
             return HttpResult.ok();
         }
 
@@ -164,7 +170,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
                     break;
                 }
             }
-            baseMapper.updateById(sysDeptVo);
+            sysDeptMapper.updateById(sysDeptVo);
         }
         //向下换位
         if (newOrderNum > orderNum) {
@@ -182,10 +188,10 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
                     break;
                 }
             }
-            baseMapper.updateById(sysDeptVo);
+            sysDeptMapper.updateById(sysDeptVo);
         }
         if (newOrderNum.equals(orderNum)) {
-            baseMapper.updateById(sysDeptVo);
+            sysDeptMapper.updateById(sysDeptVo);
         }
         return HttpResult.ok();
     }
@@ -200,7 +206,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
                 throw new SystemException("机构不存在");
             }
             sysDept.setLeaderId(sysDeptVo.getLeaderId());
-            baseMapper.updateById(sysDept);
+            sysDeptMapper.updateById(sysDept);
         }
         return HttpResult.ok("批量设置负责人成功。");
     }
@@ -221,7 +227,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
 //            throw new SystemException(sysDept.getName() + "机构下还有其他用户请将这些用户删除后，再进行删除");
 //        }
         sysDept.setDelFlag(1);
-        baseMapper.updateById(sysDept);
+        sysDeptMapper.updateById(sysDept);
         return HttpResult.ok("删除机构成功");
     }
 
@@ -243,7 +249,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
 //                throw new SystemException(sysDept.getName() + "机构下还有其他用户请将这些用户删除后，再进行删除");
 //            }
             sysDept.setDelFlag(1);
-            baseMapper.updateById(sysDept);
+            sysDeptMapper.updateById(sysDept);
         }
         return HttpResult.ok("批量删除机构成功");
     }
@@ -263,7 +269,7 @@ public class DeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impleme
     @Override
     public List<Tree<String>> selectDeptTreeList(String systemCode) {
         LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(systemCode);
-        List<SysDept> depts = baseMapper.selectDeptList(lqw);
+        List<SysDept> depts = sysDeptMapper.selectDeptList(lqw);
         return buildDeptTreeSelect(depts);
     }