diff --git a/api/src/main/java/com/wansensoft/api/depot/DepotItemController.java b/api/src/main/java/com/wansensoft/api/depot/DepotItemController.java
index ed5fc6d7..5ec6315d 100644
--- a/api/src/main/java/com/wansensoft/api/depot/DepotItemController.java
+++ b/api/src/main/java/com/wansensoft/api/depot/DepotItemController.java
@@ -7,6 +7,7 @@
 import com.wansensoft.entities.depot.DepotItemVo4WithInfoEx;
 import com.wansensoft.entities.material.MaterialVo4Unit;
 import com.wansensoft.entities.unit.Unit;
+import com.wansensoft.service.role.RoleServiceImpl;
 import com.wansensoft.service.user.UserServiceImpl;
 import com.wansensoft.utils.constants.BusinessConstants;
 import com.wansensoft.utils.constants.ExceptionConstants;
@@ -15,7 +16,6 @@
 import com.wansensoft.service.depotHead.DepotHeadServiceImpl;
 import com.wansensoft.service.depotItem.DepotItemServiceImpl;
 import com.wansensoft.service.material.MaterialServiceImpl;
-import com.wansensoft.service.role.RoleService;
 import com.wansensoft.service.systemConfig.SystemConfigService;
 import com.wansensoft.service.unit.UnitService;
 import com.wansensoft.utils.*;
@@ -65,7 +65,7 @@ public class DepotItemController {
     private DepotServiceImpl depotServiceImpl;
 
     @Resource
-    private RoleService roleService;
+    private RoleServiceImpl roleServiceImpl;
 
     @Resource
     private UserServiceImpl userServiceImpl;
@@ -247,15 +247,15 @@ public BaseResponseInfo getDetailList(@RequestParam("headerId") Long headerId,
                     item.put("basicNumber", diEx.getBasicNumber());
                     item.put("preNumber", diEx.getOperNumber()); //原数量
                     item.put("finishNumber", depotItemServiceImpl.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库
-                    item.put("purchaseDecimal", roleService.parseBillPriceByLimit(diEx.getPurchaseDecimal(), billCategory, priceLimit, request));  //采购价
+                    item.put("purchaseDecimal", roleServiceImpl.parseBillPriceByLimit(diEx.getPurchaseDecimal(), billCategory, priceLimit, request));  //采购价
                     if("basic".equals(linkType)) {
                         //正常情况显示金额，而以销定购的情况不能显示金额
-                        item.put("unitPrice", roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request));
-                        item.put("taxUnitPrice", roleService.parseBillPriceByLimit(diEx.getTaxUnitPrice(), billCategory, priceLimit, request));
-                        item.put("allPrice", roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request));
-                        item.put("taxRate", roleService.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request));
-                        item.put("taxMoney", roleService.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request));
-                        item.put("taxLastMoney", roleService.parseBillPriceByLimit(diEx.getTaxLastMoney(), billCategory, priceLimit, request));
+                        item.put("unitPrice", roleServiceImpl.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request));
+                        item.put("taxUnitPrice", roleServiceImpl.parseBillPriceByLimit(diEx.getTaxUnitPrice(), billCategory, priceLimit, request));
+                        item.put("allPrice", roleServiceImpl.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request));
+                        item.put("taxRate", roleServiceImpl.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request));
+                        item.put("taxMoney", roleServiceImpl.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request));
+                        item.put("taxLastMoney", roleServiceImpl.parseBillPriceByLimit(diEx.getTaxLastMoney(), billCategory, priceLimit, request));
                     }
                     BigDecimal allWeight = diEx.getBasicNumber()==null||diEx.getWeight()==null?BigDecimal.ZERO:diEx.getBasicNumber().multiply(diEx.getWeight());
                     item.put("weight", allWeight);
@@ -286,9 +286,9 @@ public BaseResponseInfo getDetailList(@RequestParam("headerId") Long headerId,
                 if(StringUtil.isNotEmpty(isReadOnly) && "1".equals(isReadOnly)) {
                     JSONObject footItem = new JSONObject();
                     footItem.put("operNumber", totalOperNumber);
-                    footItem.put("allPrice", roleService.parseBillPriceByLimit(totalAllPrice, billCategory, priceLimit, request));
-                    footItem.put("taxMoney", roleService.parseBillPriceByLimit(totalTaxMoney, billCategory, priceLimit, request));
-                    footItem.put("taxLastMoney", roleService.parseBillPriceByLimit(totalTaxLastMoney, billCategory, priceLimit, request));
+                    footItem.put("allPrice", roleServiceImpl.parseBillPriceByLimit(totalAllPrice, billCategory, priceLimit, request));
+                    footItem.put("taxMoney", roleServiceImpl.parseBillPriceByLimit(totalTaxMoney, billCategory, priceLimit, request));
+                    footItem.put("taxLastMoney", roleServiceImpl.parseBillPriceByLimit(totalTaxLastMoney, billCategory, priceLimit, request));
                     footItem.put("weight", totalWeight);
                     dataArray.add(footItem);
                 }
@@ -829,7 +829,7 @@ public BaseResponseInfo buyOrSalePrice(@RequestParam(value = "roleType", require
                 BigDecimal outPrice = depotItemServiceImpl.inOrOutPrice("入库", "采购", month, roleType);
                 BigDecimal inPrice = depotItemServiceImpl.inOrOutPrice("出库", "采购退货", month, roleType);
                 obj.put("x", month);
-                obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "buy", priceLimit, "***", request));
+                obj.put("y", roleServiceImpl.parseHomePriceByLimit(outPrice.subtract(inPrice), "buy", priceLimit, "***", request));
                 buyPriceList.add(obj);
             }
             map.put("buyPriceList", buyPriceList);
@@ -839,7 +839,7 @@ public BaseResponseInfo buyOrSalePrice(@RequestParam(value = "roleType", require
                 BigDecimal outPrice = depotItemServiceImpl.inOrOutPrice("出库", "销售", month, roleType);
                 BigDecimal inPrice = depotItemServiceImpl.inOrOutPrice("入库", "销售退货", month, roleType);
                 obj.put("x", month);
-                obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "sale", priceLimit, "***", request));
+                obj.put("y", roleServiceImpl.parseHomePriceByLimit(outPrice.subtract(inPrice), "sale", priceLimit, "***", request));
                 salePriceList.add(obj);
             }
             map.put("salePriceList", salePriceList);
@@ -849,7 +849,7 @@ public BaseResponseInfo buyOrSalePrice(@RequestParam(value = "roleType", require
                 BigDecimal outPrice = depotItemServiceImpl.inOrOutRetailPrice("出库", "零售", month, roleType);
                 BigDecimal inPrice = depotItemServiceImpl.inOrOutRetailPrice("入库", "零售退货", month, roleType);
                 obj.put("x", month);
-                obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "retail", priceLimit, "***", request));
+                obj.put("y", roleServiceImpl.parseHomePriceByLimit(outPrice.subtract(inPrice), "retail", priceLimit, "***", request));
                 retailPriceList.add(obj);
             }
             map.put("retailPriceList", retailPriceList);
diff --git a/api/src/main/java/com/wansensoft/api/organization/OrganizationController.java b/api/src/main/java/com/wansensoft/api/organization/OrganizationController.java
index 916b787c..337c41e4 100644
--- a/api/src/main/java/com/wansensoft/api/organization/OrganizationController.java
+++ b/api/src/main/java/com/wansensoft/api/organization/OrganizationController.java
@@ -4,9 +4,9 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.entities.organization.Organization;
+import com.wansensoft.service.organization.OrganizationServiceImpl;
 import com.wansensoft.utils.constants.ExceptionConstants;
 import com.wansensoft.plugins.exception.BusinessRunTimeException;
-import com.wansensoft.service.organization.OrganizationService;
 import com.wansensoft.utils.BaseResponseInfo;
 import com.wansensoft.vo.TreeNode;
 import io.swagger.annotations.Api;
@@ -28,7 +28,7 @@ public class OrganizationController {
     private Logger logger = LoggerFactory.getLogger(OrganizationController.class);
 
     @Resource
-    private OrganizationService organizationService;
+    private OrganizationServiceImpl organizationServiceImpl;
     /**
      * 根据id来查询机构信息
      * @param id
@@ -41,14 +41,14 @@ public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest
         BaseResponseInfo res = new BaseResponseInfo();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
-            List<Organization> dataList = organizationService.findById(id);
+            List<Organization> dataList = organizationServiceImpl.findById(id);
             JSONObject outer = new JSONObject();
             if (null != dataList) {
                 for (Organization org : dataList) {
                     outer.put("id", org.getId());
                     outer.put("orgAbr", org.getOrgAbr());
                     outer.put("parentId", org.getParentId());
-                    List<Organization> dataParentList = organizationService.findByParentId(org.getParentId());
+                    List<Organization> dataParentList = organizationServiceImpl.findByParentId(org.getParentId());
                     if(dataParentList!=null&&dataParentList.size()>0){
                         //父级机构名称显示简称
                         outer.put("orgParentName", dataParentList.get(0).getOrgAbr());
@@ -78,7 +78,7 @@ public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest
     @ApiOperation(value = "获取机构树数据")
     public JSONArray getOrganizationTree(@RequestParam("id") Long id) throws Exception{
        JSONArray arr=new JSONArray();
-       List<TreeNode> organizationTree= organizationService.getOrganizationTree(id);
+       List<TreeNode> organizationTree= organizationServiceImpl.getOrganizationTree(id);
        if(organizationTree!=null&&organizationTree.size()>0){
            for(TreeNode node:organizationTree){
                String str=JSON.toJSONString(node);
@@ -99,7 +99,7 @@ public JSONArray getOrganizationTree(@RequestParam("id") Long id) throws Excepti
     public Object addOrganization(@RequestParam("info") String beanJson) throws Exception {
         JSONObject result = ExceptionConstants.standardSuccess();
         Organization org= JSON.parseObject(beanJson, Organization.class);
-        int i= organizationService.addOrganization(org);
+        int i= organizationServiceImpl.addOrganization(org);
         if(i<1){
             throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ADD_FAILED_CODE,
                     ExceptionConstants.ORGANIZATION_ADD_FAILED_MSG);
@@ -117,7 +117,7 @@ public Object addOrganization(@RequestParam("info") String beanJson) throws Exce
     public Object editOrganization(@RequestParam("info") String beanJson) throws Exception {
         JSONObject result = ExceptionConstants.standardSuccess();
         Organization org= JSON.parseObject(beanJson, Organization.class);
-        int i= organizationService.editOrganization(org);
+        int i= organizationServiceImpl.editOrganization(org);
         if(i<1){
             throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_EDIT_FAILED_CODE,
                     ExceptionConstants.ORGANIZATION_EDIT_FAILED_MSG);
diff --git a/api/src/main/java/com/wansensoft/api/role/RoleController.java b/api/src/main/java/com/wansensoft/api/role/RoleController.java
index 5e8e510c..cf735e0e 100644
--- a/api/src/main/java/com/wansensoft/api/role/RoleController.java
+++ b/api/src/main/java/com/wansensoft/api/role/RoleController.java
@@ -3,7 +3,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.entities.role.Role;
-import com.wansensoft.service.role.RoleService;
+import com.wansensoft.service.role.RoleServiceImpl;
 import com.wansensoft.service.userBusiness.UserBusinessServiceImpl;
 import com.wansensoft.utils.ErpInfo;
 import com.wansensoft.utils.ResponseJsonUtil;
@@ -26,7 +26,7 @@ public class RoleController {
     private Logger logger = LoggerFactory.getLogger(RoleController.class);
 
     @Resource
-    private RoleService roleService;
+    private RoleServiceImpl roleServiceImpl;
 
     @Resource
     private UserBusinessServiceImpl userBusinessServiceImpl;
@@ -44,7 +44,7 @@ public JSONArray findUserRole(@RequestParam("UBType") String type, @RequestParam
         try {
             //获取权限信息
             String ubValue = userBusinessServiceImpl.getUBValueByTypeAndKeyId(type, keyId);
-            List<Role> dataList = roleService.findUserRole();
+            List<Role> dataList = roleServiceImpl.findUserRole();
             if (null != dataList) {
                 for (Role role : dataList) {
                     JSONObject item = new JSONObject();
@@ -66,7 +66,7 @@ public JSONArray findUserRole(@RequestParam("UBType") String type, @RequestParam
     @GetMapping(value = "/allList")
     @ApiOperation(value = "查询全部角色列表")
     public List<Role> allList(HttpServletRequest request)throws Exception {
-        return roleService.allList();
+        return roleServiceImpl.allList();
     }
 
     /**
@@ -82,7 +82,7 @@ public String batchSetStatus(@RequestBody JSONObject jsonObject,
         Boolean status = jsonObject.getBoolean("status");
         String ids = jsonObject.getString("ids");
         Map<String, Object> objectMap = new HashMap<>();
-        int res = roleService.batchSetStatus(status, ids);
+        int res = roleServiceImpl.batchSetStatus(status, ids);
         if(res > 0) {
             return ResponseJsonUtil.returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
         } else {
diff --git a/api/src/main/java/com/wansensoft/api/user/UserController.java b/api/src/main/java/com/wansensoft/api/user/UserController.java
index 9cda0cf7..7ad0ad9f 100644
--- a/api/src/main/java/com/wansensoft/api/user/UserController.java
+++ b/api/src/main/java/com/wansensoft/api/user/UserController.java
@@ -11,7 +11,7 @@
 import com.wansensoft.utils.constants.ExceptionConstants;
 import com.wansensoft.plugins.exception.BusinessParamCheckingException;
 import com.wansensoft.service.redis.RedisService;
-import com.wansensoft.service.role.RoleService;
+import com.wansensoft.service.role.RoleServiceImpl;
 import com.wansensoft.service.user.UserServiceImpl;
 import com.wansensoft.utils.*;
 import com.wansensoft.vo.TreeNodeEx;
@@ -40,7 +40,7 @@ public class UserController {
     private UserServiceImpl userServiceImpl;
 
     @Resource
-    private RoleService roleService;
+    private RoleServiceImpl roleServiceImpl;
 
     @Resource
     private TenantServiceImpl tenantServiceImpl;
@@ -335,7 +335,7 @@ public BaseResponseInfo getCurrentPriceLimit(HttpServletRequest request)throws E
         BaseResponseInfo res = new BaseResponseInfo();
         try {
             Map<String, Object> data = new HashMap<>();
-            String priceLimit = roleService.getCurrentPriceLimit(request);
+            String priceLimit = roleServiceImpl.getCurrentPriceLimit(request);
             data.put("priceLimit", priceLimit);
             res.code = 200;
             res.data = data;
diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml
index 6e44a4d4..f5440234 100644
--- a/api/src/main/resources/application.yml
+++ b/api/src/main/resources/application.yml
@@ -27,7 +27,7 @@ logging:
   config: classpath:logback-spring.xml
 
 mybatis-plus:
-  mapper-locations: classpath*:./mapper_xml/*Mapper.xml,classpath*:./mapper_xml/*MapperEx.xml
+  mapper-locations: classpath*:./mapper_xml/*.xml
   type-aliases-package: com.wansensoft.entity
   global-config:
     id-type: 0
diff --git a/dao/src/main/java/com/wansensoft/mappers/account/AccountHeadMapper.java b/dao/src/main/java/com/wansensoft/mappers/account/AccountHeadMapper.java
index 503149e2..af399d28 100644
--- a/dao/src/main/java/com/wansensoft/mappers/account/AccountHeadMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/account/AccountHeadMapper.java
@@ -16,7 +16,7 @@ public interface AccountHeadMapper extends BaseMapper<AccountHead> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(AccountHead record);
+    int insertAccountHead(AccountHead record);
 
     int insertSelective(AccountHead record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/account/AccountItemMapper.java b/dao/src/main/java/com/wansensoft/mappers/account/AccountItemMapper.java
index 99de00e2..dbae5432 100644
--- a/dao/src/main/java/com/wansensoft/mappers/account/AccountItemMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/account/AccountItemMapper.java
@@ -16,7 +16,7 @@ public interface AccountItemMapper extends BaseMapper<AccountItem> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(AccountItem record);
+    int insertAccountItem(AccountItem record);
 
     int insertSelective(AccountItem record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/account/AccountMapper.java b/dao/src/main/java/com/wansensoft/mappers/account/AccountMapper.java
index 570f8aad..bd14f412 100644
--- a/dao/src/main/java/com/wansensoft/mappers/account/AccountMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/account/AccountMapper.java
@@ -16,7 +16,7 @@ public interface AccountMapper extends BaseMapper<Account> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Account record);
+    int insertAccount(Account record);
 
     int insertSelective(Account record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/depot/DepotHeadMapper.java b/dao/src/main/java/com/wansensoft/mappers/depot/DepotHeadMapper.java
index f0a0ddc7..f5116cbb 100644
--- a/dao/src/main/java/com/wansensoft/mappers/depot/DepotHeadMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/depot/DepotHeadMapper.java
@@ -17,7 +17,7 @@ public interface DepotHeadMapper extends BaseMapper<DepotHead> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(DepotHead record);
+    int insertDepotHead(DepotHead record);
 
     int insertSelective(DepotHead record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/depot/DepotItemMapper.java b/dao/src/main/java/com/wansensoft/mappers/depot/DepotItemMapper.java
index 626f085d..a28e8a48 100644
--- a/dao/src/main/java/com/wansensoft/mappers/depot/DepotItemMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/depot/DepotItemMapper.java
@@ -17,7 +17,7 @@ public interface DepotItemMapper extends BaseMapper<DepotItem> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(DepotItem record);
+    int insertDepotItem(DepotItem record);
 
     int insertSelective(DepotItem record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/depot/DepotMapper.java b/dao/src/main/java/com/wansensoft/mappers/depot/DepotMapper.java
index 6cb211b7..db0a3150 100644
--- a/dao/src/main/java/com/wansensoft/mappers/depot/DepotMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/depot/DepotMapper.java
@@ -16,7 +16,7 @@ public interface DepotMapper extends BaseMapper<Depot> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Depot record);
+    int insertDepot(Depot record);
 
     int insertSelective(Depot record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/function/FunctionMapper.java b/dao/src/main/java/com/wansensoft/mappers/function/FunctionMapper.java
index 0eaa4b97..85599779 100644
--- a/dao/src/main/java/com/wansensoft/mappers/function/FunctionMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/function/FunctionMapper.java
@@ -17,7 +17,7 @@ public interface FunctionMapper extends BaseMapper<Function> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Function record);
+    int insertFunction(Function record);
 
     int insertSelective(Function record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/inOutItem/InOutItemMapper.java b/dao/src/main/java/com/wansensoft/mappers/inOutItem/InOutItemMapper.java
index 54953337..5c04a94b 100644
--- a/dao/src/main/java/com/wansensoft/mappers/inOutItem/InOutItemMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/inOutItem/InOutItemMapper.java
@@ -17,7 +17,7 @@ public interface InOutItemMapper extends BaseMapper<InOutItem> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(InOutItem record);
+    int insertInOutItem(InOutItem record);
 
     int insertSelective(InOutItem record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/log/LogMapper.java b/dao/src/main/java/com/wansensoft/mappers/log/LogMapper.java
index 0e91dc61..94f71533 100644
--- a/dao/src/main/java/com/wansensoft/mappers/log/LogMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/log/LogMapper.java
@@ -17,7 +17,7 @@ public interface LogMapper extends BaseMapper<Log> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Log record);
+    int insertLog(Log record);
 
     int insertSelective(Log record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialAttributeMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialAttributeMapper.java
index 1cbd8b80..28c861c1 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialAttributeMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialAttributeMapper.java
@@ -17,7 +17,7 @@ public interface MaterialAttributeMapper extends BaseMapper<MaterialAttribute> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(MaterialAttribute record);
+    int insertMaterialAttribute(MaterialAttribute record);
 
     int insertSelective(MaterialAttribute record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialCategoryMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialCategoryMapper.java
index cb6393a8..5ea79e79 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialCategoryMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialCategoryMapper.java
@@ -17,7 +17,7 @@ public interface MaterialCategoryMapper extends BaseMapper<MaterialCategory> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(MaterialCategory record);
+    int insertMaterialCategory(MaterialCategory record);
 
     int insertSelective(MaterialCategory record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialCurrentStockMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialCurrentStockMapper.java
index c1d7f16f..16d26f22 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialCurrentStockMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialCurrentStockMapper.java
@@ -17,7 +17,7 @@ public interface MaterialCurrentStockMapper extends BaseMapper<MaterialCurrentSt
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(MaterialCurrentStock record);
+    int insertMaterialCurrentStock(MaterialCurrentStock record);
 
     int insertSelective(MaterialCurrentStock record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialExtendMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialExtendMapper.java
index 78c402c2..768bfdfa 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialExtendMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialExtendMapper.java
@@ -17,7 +17,7 @@ public interface MaterialExtendMapper extends BaseMapper<MaterialExtend> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(MaterialExtend record);
+    int insertMaterialExtend(MaterialExtend record);
 
     int insertSelective(MaterialExtend record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialInitialStockMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialInitialStockMapper.java
index ddd8ee39..fb27e0b3 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialInitialStockMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialInitialStockMapper.java
@@ -17,7 +17,7 @@ public interface MaterialInitialStockMapper extends BaseMapper<MaterialInitialSt
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(MaterialInitialStock record);
+    int insertMaterialInitialStock(MaterialInitialStock record);
 
     int insertSelective(MaterialInitialStock record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialMapper.java
index 7c95a409..c81b92f8 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialMapper.java
@@ -17,7 +17,7 @@ public interface MaterialMapper extends BaseMapper<Material> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Material record);
+    int insertMaterial(Material record);
 
     int insertSelective(Material record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/material/MaterialPropertyMapper.java b/dao/src/main/java/com/wansensoft/mappers/material/MaterialPropertyMapper.java
index 9f556b41..9b04b6cb 100644
--- a/dao/src/main/java/com/wansensoft/mappers/material/MaterialPropertyMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/material/MaterialPropertyMapper.java
@@ -17,7 +17,7 @@ public interface MaterialPropertyMapper extends BaseMapper<MaterialProperty> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(MaterialProperty record);
+    int insertMaterialProperty(MaterialProperty record);
 
     int insertSelective(MaterialProperty record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/msg/MsgMapper.java b/dao/src/main/java/com/wansensoft/mappers/msg/MsgMapper.java
index 81736306..8763b226 100644
--- a/dao/src/main/java/com/wansensoft/mappers/msg/MsgMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/msg/MsgMapper.java
@@ -17,7 +17,7 @@ public interface MsgMapper extends BaseMapper<Msg> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Msg record);
+    int insertMsg(Msg record);
 
     int insertSelective(Msg record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/organization/OrgaUserRelMapper.java b/dao/src/main/java/com/wansensoft/mappers/organization/OrgaUserRelMapper.java
index 6e56ac2e..f2879f1e 100644
--- a/dao/src/main/java/com/wansensoft/mappers/organization/OrgaUserRelMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/organization/OrgaUserRelMapper.java
@@ -41,7 +41,7 @@ public interface OrgaUserRelMapper extends BaseMapper<OrgaUserRel> {
      *
      * @mbggenerated
      */
-    int insert(OrgaUserRel record);
+    int insertOrgaUserRel(OrgaUserRel record);
 
     /**
      * This method was generated by MyBatis Generator.
diff --git a/dao/src/main/java/com/wansensoft/mappers/organization/OrganizationMapper.java b/dao/src/main/java/com/wansensoft/mappers/organization/OrganizationMapper.java
index fb1802eb..ecb98d05 100644
--- a/dao/src/main/java/com/wansensoft/mappers/organization/OrganizationMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/organization/OrganizationMapper.java
@@ -17,7 +17,7 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Organization record);
+    int insertOrganization(Organization record);
 
     int insertSelective(Organization record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/person/PersonMapper.java b/dao/src/main/java/com/wansensoft/mappers/person/PersonMapper.java
index 7d5b7401..f57332a3 100644
--- a/dao/src/main/java/com/wansensoft/mappers/person/PersonMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/person/PersonMapper.java
@@ -17,7 +17,7 @@ public interface PersonMapper extends BaseMapper<Person> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Person record);
+    int insertPerson(Person record);
 
     int insertSelective(Person record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/platformConfig/PlatformConfigMapper.java b/dao/src/main/java/com/wansensoft/mappers/platformConfig/PlatformConfigMapper.java
index 10231fa2..6ae06dd3 100644
--- a/dao/src/main/java/com/wansensoft/mappers/platformConfig/PlatformConfigMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/platformConfig/PlatformConfigMapper.java
@@ -17,7 +17,7 @@ public interface PlatformConfigMapper extends BaseMapper<PlatformConfig> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(PlatformConfig record);
+    int insertPlatformConfig(PlatformConfig record);
 
     int insertSelective(PlatformConfig record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/role/RoleMapper.java b/dao/src/main/java/com/wansensoft/mappers/role/RoleMapper.java
index 6434f542..b94093ac 100644
--- a/dao/src/main/java/com/wansensoft/mappers/role/RoleMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/role/RoleMapper.java
@@ -17,7 +17,7 @@ public interface RoleMapper extends BaseMapper<Role> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Role record);
+    int insertRole(Role record);
 
     int insertSelective(Role record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/serialNumber/SerialNumberMapper.java b/dao/src/main/java/com/wansensoft/mappers/serialNumber/SerialNumberMapper.java
index 1c73737e..d675bd84 100644
--- a/dao/src/main/java/com/wansensoft/mappers/serialNumber/SerialNumberMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/serialNumber/SerialNumberMapper.java
@@ -17,7 +17,7 @@ public interface SerialNumberMapper extends BaseMapper<SerialNumber> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(SerialNumber record);
+    int insertSerialNumber(SerialNumber record);
 
     int insertSelective(SerialNumber record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/supplier/SupplierMapper.java b/dao/src/main/java/com/wansensoft/mappers/supplier/SupplierMapper.java
index 18a39079..71580b39 100644
--- a/dao/src/main/java/com/wansensoft/mappers/supplier/SupplierMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/supplier/SupplierMapper.java
@@ -17,7 +17,7 @@ public interface SupplierMapper extends BaseMapper<Supplier> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Supplier record);
+    int insertSupplier(Supplier record);
 
     int insertSelective(Supplier record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/system/SystemConfigMapper.java b/dao/src/main/java/com/wansensoft/mappers/system/SystemConfigMapper.java
index 59105b61..d3ce460c 100644
--- a/dao/src/main/java/com/wansensoft/mappers/system/SystemConfigMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/system/SystemConfigMapper.java
@@ -17,7 +17,7 @@ public interface SystemConfigMapper extends BaseMapper<SystemConfig> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(SystemConfig record);
+    int insertSystemConfig(SystemConfig record);
 
     int insertSelective(SystemConfig record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/tenant/TenantMapper.java b/dao/src/main/java/com/wansensoft/mappers/tenant/TenantMapper.java
index e172de91..f8c5d720 100644
--- a/dao/src/main/java/com/wansensoft/mappers/tenant/TenantMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/tenant/TenantMapper.java
@@ -17,7 +17,7 @@ public interface TenantMapper extends BaseMapper<Tenant> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Tenant record);
+    int insertTenant(Tenant record);
 
     int insertSelective(Tenant record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/unit/UnitMapper.java b/dao/src/main/java/com/wansensoft/mappers/unit/UnitMapper.java
index fa9cdeee..ef148067 100644
--- a/dao/src/main/java/com/wansensoft/mappers/unit/UnitMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/unit/UnitMapper.java
@@ -17,7 +17,7 @@ public interface UnitMapper extends BaseMapper<Unit> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(Unit record);
+    int insertUnit(Unit record);
 
     int insertSelective(Unit record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/user/UserBusinessMapper.java b/dao/src/main/java/com/wansensoft/mappers/user/UserBusinessMapper.java
index 301de8c8..38040379 100644
--- a/dao/src/main/java/com/wansensoft/mappers/user/UserBusinessMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/user/UserBusinessMapper.java
@@ -17,7 +17,7 @@ public interface UserBusinessMapper extends BaseMapper<UserBusiness> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(UserBusiness record);
+    int insertUserBusiness(UserBusiness record);
 
     int insertSelective(UserBusiness record);
 
diff --git a/dao/src/main/java/com/wansensoft/mappers/user/UserMapper.java b/dao/src/main/java/com/wansensoft/mappers/user/UserMapper.java
index de1035e2..7ea2695f 100644
--- a/dao/src/main/java/com/wansensoft/mappers/user/UserMapper.java
+++ b/dao/src/main/java/com/wansensoft/mappers/user/UserMapper.java
@@ -17,7 +17,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(User record);
+    int insertUser(User record);
 
     int insertSelective(User record);
 
diff --git a/dao/src/main/resources/mapper_xml/AccountHeadMapper.xml b/dao/src/main/resources/mapper_xml/AccountHeadMapper.xml
index 171032d8..e3d3fb4e 100644
--- a/dao/src/main/resources/mapper_xml/AccountHeadMapper.xml
+++ b/dao/src/main/resources/mapper_xml/AccountHeadMapper.xml
@@ -112,7 +112,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.account.AccountHead">
+  <insert id="insertAccountHead" parameterType="com.wansensoft.entities.account.AccountHead">
     insert into jsh_account_head (id, type, organ_id, 
       hands_person_id, creator, change_amount, 
       discount_money, total_price, account_id, 
diff --git a/dao/src/main/resources/mapper_xml/AccountItemMapper.xml b/dao/src/main/resources/mapper_xml/AccountItemMapper.xml
index 29c58347..d6b37fc2 100644
--- a/dao/src/main/resources/mapper_xml/AccountItemMapper.xml
+++ b/dao/src/main/resources/mapper_xml/AccountItemMapper.xml
@@ -106,7 +106,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.account.AccountItem">
+  <insert id="insertAccountItem" parameterType="com.wansensoft.entities.account.AccountItem">
     insert into jsh_account_item (id, header_id, account_id, 
       in_out_item_id, bill_id, need_debt, 
       finish_debt, each_amount, remark, 
diff --git a/dao/src/main/resources/mapper_xml/AccountMapper.xml b/dao/src/main/resources/mapper_xml/AccountMapper.xml
index a14bfff4..2d221776 100644
--- a/dao/src/main/resources/mapper_xml/AccountMapper.xml
+++ b/dao/src/main/resources/mapper_xml/AccountMapper.xml
@@ -106,7 +106,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.account.Account">
+  <insert id="insertAccount" parameterType="com.wansensoft.entities.account.Account">
     insert into jsh_account (id, name, serial_no, 
       initial_amount, current_amount, remark, 
       enabled, sort, is_default, tenant_id, 
diff --git a/dao/src/main/resources/mapper_xml/DepotHeadMapper.xml b/dao/src/main/resources/mapper_xml/DepotHeadMapper.xml
index 97844f75..9e891a50 100644
--- a/dao/src/main/resources/mapper_xml/DepotHeadMapper.xml
+++ b/dao/src/main/resources/mapper_xml/DepotHeadMapper.xml
@@ -129,7 +129,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.depot.DepotHead">
+  <insert id="insertDepotHead" parameterType="com.wansensoft.entities.depot.DepotHead">
     insert into jsh_depot_head (id, type, sub_type, 
       default_number, number, create_time, 
       oper_time, organ_id, creator, 
diff --git a/dao/src/main/resources/mapper_xml/DepotItemMapper.xml b/dao/src/main/resources/mapper_xml/DepotItemMapper.xml
index ea470d1d..0235862f 100644
--- a/dao/src/main/resources/mapper_xml/DepotItemMapper.xml
+++ b/dao/src/main/resources/mapper_xml/DepotItemMapper.xml
@@ -122,7 +122,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.depot.DepotItem">
+  <insert id="insertDepotItem" parameterType="com.wansensoft.entities.depot.DepotItem">
     insert into jsh_depot_item (id, header_id, material_id, 
       material_extend_id, material_unit, sku, 
       oper_number, basic_number, unit_price, 
diff --git a/dao/src/main/resources/mapper_xml/DepotMapper.xml b/dao/src/main/resources/mapper_xml/DepotMapper.xml
index 628f789d..d3ef1bec 100644
--- a/dao/src/main/resources/mapper_xml/DepotMapper.xml
+++ b/dao/src/main/resources/mapper_xml/DepotMapper.xml
@@ -108,7 +108,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.depot.Depot">
+  <insert id="insertDepot" parameterType="com.wansensoft.entities.depot.Depot">
     insert into jsh_depot (id, name, address, 
       warehousing, truckage, type, 
       sort, remark, principal, 
diff --git a/dao/src/main/resources/mapper_xml/FunctionMapper.xml b/dao/src/main/resources/mapper_xml/FunctionMapper.xml
index eeb00300..33632722 100644
--- a/dao/src/main/resources/mapper_xml/FunctionMapper.xml
+++ b/dao/src/main/resources/mapper_xml/FunctionMapper.xml
@@ -108,7 +108,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.function.Function">
+  <insert id="insertFunction" parameterType="com.wansensoft.entities.function.Function">
     insert into jsh_function (id, number, name, 
       parent_number, url, component, 
       state, sort, enabled, type, 
diff --git a/dao/src/main/resources/mapper_xml/InOutItemMapper.xml b/dao/src/main/resources/mapper_xml/InOutItemMapper.xml
index e9000013..0be02251 100644
--- a/dao/src/main/resources/mapper_xml/InOutItemMapper.xml
+++ b/dao/src/main/resources/mapper_xml/InOutItemMapper.xml
@@ -102,7 +102,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.inOutItem.InOutItem">
+  <insert id="insertInOutItem" parameterType="com.wansensoft.entities.inOutItem.InOutItem">
     insert into jsh_in_out_item (id, name, type, 
       remark, enabled, sort, 
       tenant_id, delete_flag)
diff --git a/dao/src/main/resources/mapper_xml/LogMapper.xml b/dao/src/main/resources/mapper_xml/LogMapper.xml
index 3d53c494..c56dea11 100644
--- a/dao/src/main/resources/mapper_xml/LogMapper.xml
+++ b/dao/src/main/resources/mapper_xml/LogMapper.xml
@@ -102,7 +102,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.log.Log">
+  <insert id="insertLog" parameterType="com.wansensoft.entities.log.Log">
     insert into jsh_log (id, user_id, operation, 
       client_ip, create_time, status, 
       content, tenant_id)
diff --git a/dao/src/main/resources/mapper_xml/MaterialAttributeMapper.xml b/dao/src/main/resources/mapper_xml/MaterialAttributeMapper.xml
index 95ac380a..21cb35b9 100644
--- a/dao/src/main/resources/mapper_xml/MaterialAttributeMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialAttributeMapper.xml
@@ -99,7 +99,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.MaterialAttribute">
+  <insert id="insertMaterialAttribute" parameterType="com.wansensoft.entities.material.MaterialAttribute">
     insert into jsh_material_attribute (id, attribute_name, attribute_value, 
       tenant_id, delete_flag)
     values (#{id,jdbcType=BIGINT}, #{attributeName,jdbcType=VARCHAR}, #{attributeValue,jdbcType=VARCHAR}, 
diff --git a/dao/src/main/resources/mapper_xml/MaterialCategoryMapper.xml b/dao/src/main/resources/mapper_xml/MaterialCategoryMapper.xml
index 4d42d12f..3145a378 100644
--- a/dao/src/main/resources/mapper_xml/MaterialCategoryMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialCategoryMapper.xml
@@ -106,7 +106,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.MaterialCategory">
+  <insert id="insertMaterialCategory" parameterType="com.wansensoft.entities.material.MaterialCategory">
     insert into jsh_material_category (id, name, category_level, 
       parent_id, sort, serial_no, 
       remark, create_time, update_time, 
diff --git a/dao/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml b/dao/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml
index bce5b966..9beb4761 100644
--- a/dao/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialCurrentStockMapper.xml
@@ -100,7 +100,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.MaterialCurrentStock">
+  <insert id="insertMaterialCurrentStock" parameterType="com.wansensoft.entities.material.MaterialCurrentStock">
     insert into jsh_material_current_stock (id, material_id, depot_id, 
       current_number, tenant_id, delete_flag
       )
diff --git a/dao/src/main/resources/mapper_xml/MaterialExtendMapper.xml b/dao/src/main/resources/mapper_xml/MaterialExtendMapper.xml
index 90729d04..ce83d9f7 100644
--- a/dao/src/main/resources/mapper_xml/MaterialExtendMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialExtendMapper.xml
@@ -112,7 +112,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.MaterialExtend">
+  <insert id="insertMaterialExtend" parameterType="com.wansensoft.entities.material.MaterialExtend">
     insert into jsh_material_extend (id, material_id, bar_code, 
       commodity_unit, sku, purchase_decimal, 
       commodity_decimal, wholesale_decimal, low_decimal, 
diff --git a/dao/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml b/dao/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml
index 8f7f98df..be7fe7ce 100644
--- a/dao/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialInitialStockMapper.xml
@@ -102,7 +102,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.MaterialInitialStock">
+  <insert id="insertMaterialInitialStock" parameterType="com.wansensoft.entities.material.MaterialInitialStock">
     insert into jsh_material_initial_stock (id, material_id, depot_id, 
       number, low_safe_stock, high_safe_stock, 
       tenant_id, delete_flag)
diff --git a/dao/src/main/resources/mapper_xml/MaterialMapper.xml b/dao/src/main/resources/mapper_xml/MaterialMapper.xml
index e9d931ce..f4f91d40 100644
--- a/dao/src/main/resources/mapper_xml/MaterialMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialMapper.xml
@@ -118,7 +118,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.Material">
+  <insert id="insertMaterial" parameterType="com.wansensoft.entities.material.Material">
     insert into jsh_material (id, category_id, name, 
       mfrs, model, standard, 
       color, unit, remark, 
diff --git a/dao/src/main/resources/mapper_xml/MaterialPropertyMapper.xml b/dao/src/main/resources/mapper_xml/MaterialPropertyMapper.xml
index 9d2bc776..ff5d048c 100644
--- a/dao/src/main/resources/mapper_xml/MaterialPropertyMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MaterialPropertyMapper.xml
@@ -100,7 +100,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.material.MaterialProperty">
+  <insert id="insertMaterialProperty" parameterType="com.wansensoft.entities.material.MaterialProperty">
     insert into jsh_material_property (id, native_name, enabled, 
       sort, another_name, delete_flag
       )
diff --git a/dao/src/main/resources/mapper_xml/MsgMapper.xml b/dao/src/main/resources/mapper_xml/MsgMapper.xml
index 02869101..92b22f86 100644
--- a/dao/src/main/resources/mapper_xml/MsgMapper.xml
+++ b/dao/src/main/resources/mapper_xml/MsgMapper.xml
@@ -103,7 +103,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.msg.Msg">
+  <insert id="insertMsg" parameterType="com.wansensoft.entities.msg.Msg">
     insert into jsh_msg (id, msg_title, msg_content, 
       create_time, type, user_id, 
       status, tenant_id, delete_Flag
diff --git a/dao/src/main/resources/mapper_xml/OrgaUserRelMapper.xml b/dao/src/main/resources/mapper_xml/OrgaUserRelMapper.xml
index 9a1a17f4..327b49e1 100644
--- a/dao/src/main/resources/mapper_xml/OrgaUserRelMapper.xml
+++ b/dao/src/main/resources/mapper_xml/OrgaUserRelMapper.xml
@@ -137,7 +137,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.organization.OrgaUserRel">
+  <insert id="insertOrgaUserRel" parameterType="com.wansensoft.entities.organization.OrgaUserRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
diff --git a/dao/src/main/resources/mapper_xml/OrganizationMapper.xml b/dao/src/main/resources/mapper_xml/OrganizationMapper.xml
index 5db73778..8751b2f8 100644
--- a/dao/src/main/resources/mapper_xml/OrganizationMapper.xml
+++ b/dao/src/main/resources/mapper_xml/OrganizationMapper.xml
@@ -105,7 +105,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.organization.Organization">
+  <insert id="insertOrganization" parameterType="com.wansensoft.entities.organization.Organization">
     insert into jsh_organization (id, org_no, org_abr, 
       parent_id, sort, remark, 
       create_time, update_time, tenant_id, 
diff --git a/dao/src/main/resources/mapper_xml/PersonMapper.xml b/dao/src/main/resources/mapper_xml/PersonMapper.xml
index e0344c72..4b7a90df 100644
--- a/dao/src/main/resources/mapper_xml/PersonMapper.xml
+++ b/dao/src/main/resources/mapper_xml/PersonMapper.xml
@@ -101,7 +101,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.person.Person">
+  <insert id="insertPerson" parameterType="com.wansensoft.entities.person.Person">
     insert into jsh_person (id, type, name, 
       enabled, sort, tenant_id, 
       delete_flag)
diff --git a/dao/src/main/resources/mapper_xml/PlatformConfigMapper.xml b/dao/src/main/resources/mapper_xml/PlatformConfigMapper.xml
index 4d798902..5e8e97e9 100644
--- a/dao/src/main/resources/mapper_xml/PlatformConfigMapper.xml
+++ b/dao/src/main/resources/mapper_xml/PlatformConfigMapper.xml
@@ -98,7 +98,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.platformConfig.PlatformConfig">
+  <insert id="insertPlatformConfig" parameterType="com.wansensoft.entities.platformConfig.PlatformConfig">
     insert into jsh_platform_config (id, platform_key, platform_key_info, 
       platform_value)
     values (#{id,jdbcType=BIGINT}, #{platformKey,jdbcType=VARCHAR}, #{platformKeyInfo,jdbcType=VARCHAR}, 
diff --git a/dao/src/main/resources/mapper_xml/RoleMapper.xml b/dao/src/main/resources/mapper_xml/RoleMapper.xml
index e294ea48..2c514a37 100644
--- a/dao/src/main/resources/mapper_xml/RoleMapper.xml
+++ b/dao/src/main/resources/mapper_xml/RoleMapper.xml
@@ -104,7 +104,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.role.Role">
+  <insert id="insertRole" parameterType="com.wansensoft.entities.role.Role">
     insert into jsh_role (id, name, type, 
       price_limit, value, description, 
       enabled, sort, tenant_id, 
diff --git a/dao/src/main/resources/mapper_xml/SerialNumberMapper.xml b/dao/src/main/resources/mapper_xml/SerialNumberMapper.xml
index f5638477..26564fd7 100644
--- a/dao/src/main/resources/mapper_xml/SerialNumberMapper.xml
+++ b/dao/src/main/resources/mapper_xml/SerialNumberMapper.xml
@@ -109,7 +109,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.serialNumber.SerialNumber">
+  <insert id="insertSerialNumber" parameterType="com.wansensoft.entities.serialNumber.SerialNumber">
     insert into jsh_serial_number (id, material_id, depot_id, 
       serial_number, is_sell, remark, 
       delete_flag, create_time, creator, 
diff --git a/dao/src/main/resources/mapper_xml/SupplierMapper.xml b/dao/src/main/resources/mapper_xml/SupplierMapper.xml
index 1ec2d3f0..82284c49 100644
--- a/dao/src/main/resources/mapper_xml/SupplierMapper.xml
+++ b/dao/src/main/resources/mapper_xml/SupplierMapper.xml
@@ -121,7 +121,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.supplier.Supplier">
+  <insert id="insertSupplier" parameterType="com.wansensoft.entities.supplier.Supplier">
     insert into jsh_supplier (id, supplier, contacts, 
       phone_num, email, description, 
       isystem, type, enabled, 
diff --git a/dao/src/main/resources/mapper_xml/SystemConfigMapper.xml b/dao/src/main/resources/mapper_xml/SystemConfigMapper.xml
index 761e7432..5e8fe8a2 100644
--- a/dao/src/main/resources/mapper_xml/SystemConfigMapper.xml
+++ b/dao/src/main/resources/mapper_xml/SystemConfigMapper.xml
@@ -116,7 +116,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.system.SystemConfig">
+  <insert id="insertSystemConfig" parameterType="com.wansensoft.entities.system.SystemConfig">
     insert into jsh_system_config (id, company_name, company_contacts, 
       company_address, company_tel, company_fax, 
       company_post_code, sale_agreement, depot_flag, 
diff --git a/dao/src/main/resources/mapper_xml/TenantMapper.xml b/dao/src/main/resources/mapper_xml/TenantMapper.xml
index 93c4c120..d8dedd81 100644
--- a/dao/src/main/resources/mapper_xml/TenantMapper.xml
+++ b/dao/src/main/resources/mapper_xml/TenantMapper.xml
@@ -104,7 +104,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.tenant.Tenant">
+  <insert id="insertTenant" parameterType="com.wansensoft.entities.tenant.Tenant">
     insert into jsh_tenant (id, tenant_id, login_name, 
       user_num_limit, type, enabled, 
       create_time, expire_time, remark
diff --git a/dao/src/main/resources/mapper_xml/UnitMapper.xml b/dao/src/main/resources/mapper_xml/UnitMapper.xml
index 3ad799cc..6cefd98f 100644
--- a/dao/src/main/resources/mapper_xml/UnitMapper.xml
+++ b/dao/src/main/resources/mapper_xml/UnitMapper.xml
@@ -107,7 +107,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.unit.Unit">
+  <insert id="insertUnit" parameterType="com.wansensoft.entities.unit.Unit">
     insert into jsh_unit (id, name, basic_unit, 
       other_unit, other_unit_two, other_unit_three, 
       ratio, ratio_two, ratio_three, 
diff --git a/dao/src/main/resources/mapper_xml/UserBusinessMapper.xml b/dao/src/main/resources/mapper_xml/UserBusinessMapper.xml
index 21f8a7e0..025e7e6b 100644
--- a/dao/src/main/resources/mapper_xml/UserBusinessMapper.xml
+++ b/dao/src/main/resources/mapper_xml/UserBusinessMapper.xml
@@ -101,7 +101,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.user.UserBusiness">
+  <insert id="insertUserBusiness" parameterType="com.wansensoft.entities.user.UserBusiness">
     insert into jsh_user_business (id, type, key_id, 
       value, btn_str, tenant_id, 
       delete_flag)
diff --git a/dao/src/main/resources/mapper_xml/UserMapper.xml b/dao/src/main/resources/mapper_xml/UserMapper.xml
index 201ac91e..c96498e5 100644
--- a/dao/src/main/resources/mapper_xml/UserMapper.xml
+++ b/dao/src/main/resources/mapper_xml/UserMapper.xml
@@ -111,7 +111,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.wansensoft.entities.user.User">
+  <insert id="insertUser" parameterType="com.wansensoft.entities.user.User">
     insert into jsh_user (id, username, login_name, 
       password, leader_flag, position, 
       department, email, phonenum, 
diff --git a/domain/src/main/java/com/wansensoft/entities/tenant/TenantExample.java b/domain/src/main/java/com/wansensoft/entities/tenant/TenantExample.java
index 81f36eef..ef3edee1 100644
--- a/domain/src/main/java/com/wansensoft/entities/tenant/TenantExample.java
+++ b/domain/src/main/java/com/wansensoft/entities/tenant/TenantExample.java
@@ -1,9 +1,12 @@
 package com.wansensoft.entities.tenant;
 
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@Data
 public class TenantExample {
     protected String orderByClause;
 
@@ -19,22 +22,10 @@ public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
diff --git a/service/src/main/java/com/wansensoft/service/account/AccountServiceImpl.java b/service/src/main/java/com/wansensoft/service/account/AccountServiceImpl.java
index 523cc6b1..4313ce09 100644
--- a/service/src/main/java/com/wansensoft/service/account/AccountServiceImpl.java
+++ b/service/src/main/java/com/wansensoft/service/account/AccountServiceImpl.java
@@ -10,7 +10,7 @@
 import com.wansensoft.mappers.depot.DepotHeadMapper;
 import com.wansensoft.mappers.depot.DepotHeadMapperEx;
 import com.wansensoft.service.log.LogService;
-import com.wansensoft.service.user.UserServiceImpl;
+import com.wansensoft.service.user.UserService;
 import com.wansensoft.utils.constants.BusinessConstants;
 import com.wansensoft.utils.constants.ExceptionConstants;
 import com.wansensoft.utils.StringUtil;
@@ -46,10 +46,10 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     private final AccountItemMapper accountItemMapper;
     private final AccountItemMapperEx accountItemMapperEx;
     private final LogService logService;
-    private final UserServiceImpl userServiceImpl;
+    private final UserService userService;
     private final SystemConfigService systemConfigService;
 
-    public AccountServiceImpl(AccountMapper accountMapper, AccountMapperEx accountMapperEx, DepotHeadMapper depotHeadMapper, DepotHeadMapperEx depotHeadMapperEx, AccountHeadMapper accountHeadMapper, AccountHeadMapperEx accountHeadMapperEx, AccountItemMapper accountItemMapper, AccountItemMapperEx accountItemMapperEx, LogService logService, UserServiceImpl userServiceImpl, SystemConfigService systemConfigService) {
+    public AccountServiceImpl(AccountMapper accountMapper, AccountMapperEx accountMapperEx, DepotHeadMapper depotHeadMapper, DepotHeadMapperEx depotHeadMapperEx, AccountHeadMapper accountHeadMapper, AccountHeadMapperEx accountHeadMapperEx, AccountItemMapper accountItemMapper, AccountItemMapperEx accountItemMapperEx, LogService logService, UserService userService, SystemConfigService systemConfigService) {
         this.accountMapper = accountMapper;
         this.accountMapperEx = accountMapperEx;
         this.depotHeadMapper = depotHeadMapper;
@@ -59,7 +59,7 @@ public AccountServiceImpl(AccountMapper accountMapper, AccountMapperEx accountMa
         this.accountItemMapper = accountItemMapper;
         this.accountItemMapperEx = accountItemMapperEx;
         this.logService = logService;
-        this.userServiceImpl = userServiceImpl;
+        this.userService = userService;
         this.systemConfigService = systemConfigService;
     }
 
@@ -242,7 +242,7 @@ public int batchDeleteAccountByIds(String ids) throws Exception{
         }
         logService.insertLog("账户", sb.toString(),
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        User userInfo= userServiceImpl.getCurrentUser();
+        User userInfo = userService.getCurrentUser();
         //校验通过执行删除操作
         try{
             result = accountMapperEx.batchDeleteAccountByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
diff --git a/service/src/main/java/com/wansensoft/service/accountHead/AccountHeadServiceImpl.java b/service/src/main/java/com/wansensoft/service/accountHead/AccountHeadServiceImpl.java
index 34164f56..e037cb28 100644
--- a/service/src/main/java/com/wansensoft/service/accountHead/AccountHeadServiceImpl.java
+++ b/service/src/main/java/com/wansensoft/service/accountHead/AccountHeadServiceImpl.java
@@ -11,13 +11,13 @@
 import com.wansensoft.mappers.account.AccountHeadMapperEx;
 import com.wansensoft.mappers.account.AccountItemMapperEx;
 import com.wansensoft.service.log.LogService;
+import com.wansensoft.service.orgaUserRel.OrgaUserRelServiceImpl;
 import com.wansensoft.service.user.UserService;
 import com.wansensoft.utils.constants.BusinessConstants;
 import com.wansensoft.utils.constants.ExceptionConstants;
 import com.wansensoft.plugins.exception.BusinessRunTimeException;
 import com.wansensoft.plugins.exception.JshException;
 import com.wansensoft.service.accountItem.AccountItemService;
-import com.wansensoft.service.orgaUserRel.OrgaUserRelService;
 import com.wansensoft.service.supplier.SupplierService;
 import com.wansensoft.utils.StringUtil;
 import com.wansensoft.utils.Tools;
@@ -39,17 +39,17 @@ public class AccountHeadServiceImpl extends ServiceImpl<AccountHeadMapper, Accou
     private Logger logger = LoggerFactory.getLogger(AccountHeadServiceImpl.class);
     private final AccountHeadMapper accountHeadMapper;
     private final AccountHeadMapperEx accountHeadMapperEx;
-    private final OrgaUserRelService orgaUserRelService;
+    private final OrgaUserRelServiceImpl orgaUserRelServiceImpl;
     private final AccountItemService accountItemService;
     private final UserService userService;
     private final SupplierService supplierService;
     private final LogService logService;
     private final AccountItemMapperEx accountItemMapperEx;
 
-    public AccountHeadServiceImpl(AccountHeadMapper accountHeadMapper, AccountHeadMapperEx accountHeadMapperEx, OrgaUserRelService orgaUserRelService, AccountItemService accountItemService, UserService userService, SupplierService supplierService, LogService logService, AccountItemMapperEx accountItemMapperEx) {
+    public AccountHeadServiceImpl(AccountHeadMapper accountHeadMapper, AccountHeadMapperEx accountHeadMapperEx, OrgaUserRelServiceImpl orgaUserRelServiceImpl, AccountItemService accountItemService, UserService userService, SupplierService supplierService, LogService logService, AccountItemMapperEx accountItemMapperEx) {
         this.accountHeadMapper = accountHeadMapper;
         this.accountHeadMapperEx = accountHeadMapperEx;
-        this.orgaUserRelService = orgaUserRelService;
+        this.orgaUserRelServiceImpl = orgaUserRelServiceImpl;
         this.accountItemService = accountItemService;
         this.userService = userService;
         this.supplierService = supplierService;
@@ -165,7 +165,7 @@ private String[] getCreatorArray(String roleType) {
         if(BusinessConstants.ROLE_TYPE_PRIVATE.equals(roleType)) {
             creator = user.getId().toString();
         } else if(BusinessConstants.ROLE_TYPE_THIS_ORG.equals(roleType)) {
-            creator = orgaUserRelService.getUserIdListByUserId(user.getId());
+            creator = orgaUserRelServiceImpl.getUserIdListByUserId(user.getId());
         }
         String [] creatorArray=null;
         if(StringUtil.isNotEmpty(creator)){
diff --git a/service/src/main/java/com/wansensoft/service/depotHead/DepotHeadServiceImpl.java b/service/src/main/java/com/wansensoft/service/depotHead/DepotHeadServiceImpl.java
index 9d5265f1..16196586 100644
--- a/service/src/main/java/com/wansensoft/service/depotHead/DepotHeadServiceImpl.java
+++ b/service/src/main/java/com/wansensoft/service/depotHead/DepotHeadServiceImpl.java
@@ -17,6 +17,7 @@
 import com.wansensoft.service.accountHead.AccountHeadServiceImpl;
 import com.wansensoft.service.depot.DepotService;
 import com.wansensoft.service.log.LogService;
+import com.wansensoft.service.orgaUserRel.OrgaUserRelServiceImpl;
 import com.wansensoft.service.user.UserService;
 import com.wansensoft.service.userBusiness.UserBusinessService;
 import com.wansensoft.utils.constants.BusinessConstants;
@@ -25,9 +26,8 @@
 import com.wansensoft.plugins.exception.JshException;
 import com.wansensoft.service.accountItem.AccountItemService;
 import com.wansensoft.service.depotItem.DepotItemServiceImpl;
-import com.wansensoft.service.orgaUserRel.OrgaUserRelService;
 import com.wansensoft.service.person.PersonService;
-import com.wansensoft.service.role.RoleService;
+import com.wansensoft.service.role.RoleServiceImpl;
 import com.wansensoft.service.serialNumber.SerialNumberService;
 import com.wansensoft.service.supplier.SupplierService;
 import com.wansensoft.service.systemConfig.SystemConfigService;
@@ -52,14 +52,14 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
     private final DepotHeadMapper depotHeadMapper;
     private final DepotHeadMapperEx depotHeadMapperEx;
     private final UserService userService;
-    private final RoleService roleService;
+    private final RoleServiceImpl roleServiceImpl;
     private final DepotService depotService;
     private final DepotItemServiceImpl depotItemServiceImpl;
     private final SupplierService supplierService;
     private final UserBusinessService userBusinessService;
     private final SystemConfigService systemConfigService;
     private final SerialNumberService serialNumberService;
-    private final OrgaUserRelService orgaUserRelService;
+    private final OrgaUserRelServiceImpl orgaUserRelServiceImpl;
     private final PersonService personService;
     private final AccountService accountService;
     private final AccountHeadServiceImpl accountHeadServiceImpl;
@@ -67,18 +67,18 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
     private final DepotItemMapperEx depotItemMapperEx;
     private final LogService logService;
 
-    public DepotHeadServiceImpl(DepotHeadMapper depotHeadMapper, DepotHeadMapperEx depotHeadMapperEx, UserService userService, RoleService roleService, DepotService depotService, DepotItemServiceImpl depotItemServiceImpl, SupplierService supplierService, UserBusinessService userBusinessService, SystemConfigService systemConfigService, SerialNumberService serialNumberService, OrgaUserRelService orgaUserRelService, PersonService personService, AccountService accountService, AccountHeadServiceImpl accountHeadServiceImpl, AccountItemService accountItemService, DepotItemMapperEx depotItemMapperEx, LogService logService) {
+    public DepotHeadServiceImpl(DepotHeadMapper depotHeadMapper, DepotHeadMapperEx depotHeadMapperEx, UserService userService, RoleServiceImpl roleServiceImpl, DepotService depotService, DepotItemServiceImpl depotItemServiceImpl, SupplierService supplierService, UserBusinessService userBusinessService, SystemConfigService systemConfigService, SerialNumberService serialNumberService, OrgaUserRelServiceImpl orgaUserRelServiceImpl, PersonService personService, AccountService accountService, AccountHeadServiceImpl accountHeadServiceImpl, AccountItemService accountItemService, DepotItemMapperEx depotItemMapperEx, LogService logService) {
         this.depotHeadMapper = depotHeadMapper;
         this.depotHeadMapperEx = depotHeadMapperEx;
         this.userService = userService;
-        this.roleService = roleService;
+        this.roleServiceImpl = roleServiceImpl;
         this.depotService = depotService;
         this.depotItemServiceImpl = depotItemServiceImpl;
         this.supplierService = supplierService;
         this.userBusinessService = userBusinessService;
         this.systemConfigService = systemConfigService;
         this.serialNumberService = serialNumberService;
-        this.orgaUserRelService = orgaUserRelService;
+        this.orgaUserRelServiceImpl = orgaUserRelServiceImpl;
         this.personService = personService;
         this.accountService = accountService;
         this.accountHeadServiceImpl = accountHeadServiceImpl;
@@ -155,33 +155,33 @@ public List<DepotHeadVo4List> select(String type, String subType, String roleTyp
                         dh.setAccountMoneyList(accountmoneylistStr);
                     }
                     if(dh.getChangeAmount() != null) {
-                        dh.setChangeAmount(roleService.parseBillPriceByLimit(dh.getChangeAmount().abs(), billCategory, priceLimit, request));
+                        dh.setChangeAmount(roleServiceImpl.parseBillPriceByLimit(dh.getChangeAmount().abs(), billCategory, priceLimit, request));
                     } else {
                         dh.setChangeAmount(BigDecimal.ZERO);
                     }
                     if(dh.getTotalPrice() != null) {
-                        dh.setTotalPrice(roleService.parseBillPriceByLimit(dh.getTotalPrice().abs(), billCategory, priceLimit, request));
+                        dh.setTotalPrice(roleServiceImpl.parseBillPriceByLimit(dh.getTotalPrice().abs(), billCategory, priceLimit, request));
                     }
                     BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO;
-                    dh.setDiscountLastMoney(roleService.parseBillPriceByLimit(discountLastMoney, billCategory, priceLimit, request));
+                    dh.setDiscountLastMoney(roleServiceImpl.parseBillPriceByLimit(discountLastMoney, billCategory, priceLimit, request));
                     BigDecimal backAmount = dh.getBackAmount()!=null?dh.getBackAmount():BigDecimal.ZERO;
-                    dh.setBackAmount(roleService.parseBillPriceByLimit(backAmount, billCategory, priceLimit, request));
+                    dh.setBackAmount(roleServiceImpl.parseBillPriceByLimit(backAmount, billCategory, priceLimit, request));
                     if(dh.getDeposit() == null) {
                         dh.setDeposit(BigDecimal.ZERO);
                     } else {
-                        dh.setDeposit(roleService.parseBillPriceByLimit(dh.getDeposit(), billCategory, priceLimit, request));
+                        dh.setDeposit(roleServiceImpl.parseBillPriceByLimit(dh.getDeposit(), billCategory, priceLimit, request));
                     }
                     //已经完成的欠款
                     if(finishDepositMap!=null) {
                         BigDecimal finishDeposit = finishDepositMap.get(dh.getNumber()) != null ? finishDepositMap.get(dh.getNumber()) : BigDecimal.ZERO;
-                        dh.setFinishDeposit(roleService.parseBillPriceByLimit(finishDeposit, billCategory, priceLimit, request));
+                        dh.setFinishDeposit(roleServiceImpl.parseBillPriceByLimit(finishDeposit, billCategory, priceLimit, request));
                     }
                     //欠款计算
                     BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO;
                     BigDecimal deposit = dh.getDeposit()!=null?dh.getDeposit():BigDecimal.ZERO;
                     BigDecimal changeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount():BigDecimal.ZERO;
                     BigDecimal debt = discountLastMoney.add(otherMoney).subtract((deposit.add(changeAmount)));
-                    dh.setDebt(roleService.parseBillPriceByLimit(debt, billCategory, priceLimit, request));
+                    dh.setDebt(roleServiceImpl.parseBillPriceByLimit(debt, billCategory, priceLimit, request));
                     //是否有付款单或收款单
                     if(financialBillNoMap!=null) {
                         Integer financialBillNoSize = financialBillNoMap.get(dh.getId());
@@ -319,7 +319,7 @@ public String getCreatorByRoleType(String roleType) {
         if(BusinessConstants.ROLE_TYPE_PRIVATE.equals(roleType)) {
             creator = user.getId().toString();
         } else if(BusinessConstants.ROLE_TYPE_THIS_ORG.equals(roleType)) {
-            creator = orgaUserRelService.getUserIdListByUserId(user.getId());
+            creator = orgaUserRelServiceImpl.getUserIdListByUserId(user.getId());
         }
         return creator;
     }
@@ -792,28 +792,28 @@ public List<DepotHeadVo4List> getDetailByNumber(String number, HttpServletReques
                     dh.setAccountMoneyList(accountmoneylistStr);
                 }
                 if(dh.getChangeAmount() != null) {
-                    dh.setChangeAmount(roleService.parseBillPriceByLimit(dh.getChangeAmount().abs(), billCategory, priceLimit, request));
+                    dh.setChangeAmount(roleServiceImpl.parseBillPriceByLimit(dh.getChangeAmount().abs(), billCategory, priceLimit, request));
                 } else {
                     dh.setChangeAmount(BigDecimal.ZERO);
                 }
                 if(dh.getTotalPrice() != null) {
-                    dh.setTotalPrice(roleService.parseBillPriceByLimit(dh.getTotalPrice().abs(), billCategory, priceLimit, request));
+                    dh.setTotalPrice(roleServiceImpl.parseBillPriceByLimit(dh.getTotalPrice().abs(), billCategory, priceLimit, request));
                 }
                 BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO;
-                dh.setDiscountLastMoney(roleService.parseBillPriceByLimit(discountLastMoney, billCategory, priceLimit, request));
+                dh.setDiscountLastMoney(roleServiceImpl.parseBillPriceByLimit(discountLastMoney, billCategory, priceLimit, request));
                 BigDecimal backAmount = dh.getBackAmount()!=null?dh.getBackAmount():BigDecimal.ZERO;
-                dh.setBackAmount(roleService.parseBillPriceByLimit(backAmount, billCategory, priceLimit, request));
+                dh.setBackAmount(roleServiceImpl.parseBillPriceByLimit(backAmount, billCategory, priceLimit, request));
                 if(dh.getDeposit() == null) {
                     dh.setDeposit(BigDecimal.ZERO);
                 } else {
-                    dh.setDeposit(roleService.parseBillPriceByLimit(dh.getDeposit(), billCategory, priceLimit, request));
+                    dh.setDeposit(roleServiceImpl.parseBillPriceByLimit(dh.getDeposit(), billCategory, priceLimit, request));
                 }
                 //欠款计算
                 BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO;
                 BigDecimal deposit = dh.getDeposit()!=null?dh.getDeposit():BigDecimal.ZERO;
                 BigDecimal changeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount():BigDecimal.ZERO;
                 BigDecimal debt = discountLastMoney.add(otherMoney).subtract((deposit.add(changeAmount)));
-                dh.setDebt(roleService.parseBillPriceByLimit(debt, billCategory, priceLimit, request));
+                dh.setDebt(roleServiceImpl.parseBillPriceByLimit(debt, billCategory, priceLimit, request));
                 //是否有付款单或收款单
                 if(financialBillNoMap!=null) {
                     Integer financialBillNoSize = financialBillNoMap.get(dh.getId());
@@ -1181,18 +1181,18 @@ public Map<String, Object> getBuyAndSaleStatistics(String today, String monthFir
                 yearBegin, yearEnd, creatorArray); //今年零售出库
         BigDecimal yearRetailSaleBack = getBuyAndSaleRetailStatistics("入库", "零售退货",
                 yearBegin, yearEnd, creatorArray); //今年零售退货
-        map.put("todayBuy", roleService.parseHomePriceByLimit(todayBuy.subtract(todayBuyBack), "buy", priceLimit, "***", request));
-        map.put("todaySale", roleService.parseHomePriceByLimit(todaySale.subtract(todaySaleBack), "sale", priceLimit, "***", request));
-        map.put("todayRetailSale", roleService.parseHomePriceByLimit(todayRetailSale.subtract(todayRetailSaleBack), "retail", priceLimit, "***", request));
-        map.put("monthBuy", roleService.parseHomePriceByLimit(monthBuy.subtract(monthBuyBack), "buy", priceLimit, "***", request));
-        map.put("monthSale", roleService.parseHomePriceByLimit(monthSale.subtract(monthSaleBack), "sale", priceLimit, "***", request));
-        map.put("monthRetailSale", roleService.parseHomePriceByLimit(monthRetailSale.subtract(monthRetailSaleBack), "retail", priceLimit, "***", request));
-        map.put("yesterdayBuy", roleService.parseHomePriceByLimit(yesterdayBuy.subtract(yesterdayBuyBack), "buy", priceLimit, "***", request));
-        map.put("yesterdaySale", roleService.parseHomePriceByLimit(yesterdaySale.subtract(yesterdaySaleBack), "sale", priceLimit, "***", request));
-        map.put("yesterdayRetailSale", roleService.parseHomePriceByLimit(yesterdayRetailSale.subtract(yesterdayRetailSaleBack), "retail", priceLimit, "***", request));
-        map.put("yearBuy", roleService.parseHomePriceByLimit(yearBuy.subtract(yearBuyBack), "buy", priceLimit, "***", request));
-        map.put("yearSale", roleService.parseHomePriceByLimit(yearSale.subtract(yearSaleBack), "sale", priceLimit, "***", request));
-        map.put("yearRetailSale", roleService.parseHomePriceByLimit(yearRetailSale.subtract(yearRetailSaleBack), "retail", priceLimit, "***", request));
+        map.put("todayBuy", roleServiceImpl.parseHomePriceByLimit(todayBuy.subtract(todayBuyBack), "buy", priceLimit, "***", request));
+        map.put("todaySale", roleServiceImpl.parseHomePriceByLimit(todaySale.subtract(todaySaleBack), "sale", priceLimit, "***", request));
+        map.put("todayRetailSale", roleServiceImpl.parseHomePriceByLimit(todayRetailSale.subtract(todayRetailSaleBack), "retail", priceLimit, "***", request));
+        map.put("monthBuy", roleServiceImpl.parseHomePriceByLimit(monthBuy.subtract(monthBuyBack), "buy", priceLimit, "***", request));
+        map.put("monthSale", roleServiceImpl.parseHomePriceByLimit(monthSale.subtract(monthSaleBack), "sale", priceLimit, "***", request));
+        map.put("monthRetailSale", roleServiceImpl.parseHomePriceByLimit(monthRetailSale.subtract(monthRetailSaleBack), "retail", priceLimit, "***", request));
+        map.put("yesterdayBuy", roleServiceImpl.parseHomePriceByLimit(yesterdayBuy.subtract(yesterdayBuyBack), "buy", priceLimit, "***", request));
+        map.put("yesterdaySale", roleServiceImpl.parseHomePriceByLimit(yesterdaySale.subtract(yesterdaySaleBack), "sale", priceLimit, "***", request));
+        map.put("yesterdayRetailSale", roleServiceImpl.parseHomePriceByLimit(yesterdayRetailSale.subtract(yesterdayRetailSaleBack), "retail", priceLimit, "***", request));
+        map.put("yearBuy", roleServiceImpl.parseHomePriceByLimit(yearBuy.subtract(yearBuyBack), "buy", priceLimit, "***", request));
+        map.put("yearSale", roleServiceImpl.parseHomePriceByLimit(yearSale.subtract(yearSaleBack), "sale", priceLimit, "***", request));
+        map.put("yearRetailSale", roleServiceImpl.parseHomePriceByLimit(yearRetailSale.subtract(yearRetailSaleBack), "retail", priceLimit, "***", request));
         return map;
     }
 
diff --git a/service/src/main/java/com/wansensoft/service/log/LogServiceImpl.java b/service/src/main/java/com/wansensoft/service/log/LogServiceImpl.java
index 078757e2..ecd9c8b6 100644
--- a/service/src/main/java/com/wansensoft/service/log/LogServiceImpl.java
+++ b/service/src/main/java/com/wansensoft/service/log/LogServiceImpl.java
@@ -4,7 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wansensoft.entities.log.Log;
 import com.wansensoft.entities.log.LogExample;
-import com.wansensoft.service.user.UserServiceImpl;
+import com.wansensoft.service.user.UserService;
 import com.wansensoft.utils.constants.BusinessConstants;
 import com.wansensoft.plugins.exception.JshException;
 import com.wansensoft.mappers.log.LogMapper;
@@ -30,13 +30,13 @@ public class LogServiceImpl extends ServiceImpl<LogMapper, Log> implements LogSe
 
     private final LogMapper logMapper;
     private final LogMapperEx logMapperEx;
-    private UserServiceImpl userServiceImpl;
+    private final UserService userService;
     private final RedisService redisService;
 
-    public LogServiceImpl(LogMapper logMapper, LogMapperEx logMapperEx, UserServiceImpl userServiceImpl, RedisService redisService) {
+    public LogServiceImpl(LogMapper logMapper, LogMapperEx logMapperEx, UserService userService, RedisService redisService) {
         this.logMapper = logMapper;
         this.logMapperEx = logMapperEx;
-        this.userServiceImpl = userServiceImpl;
+        this.userService = userService;
         this.redisService = redisService;
     }
 
@@ -144,7 +144,7 @@ public int batchDeleteLog(String ids, HttpServletRequest request) {
 
     public void insertLog(String moduleName, String content, HttpServletRequest request) {
         try{
-            Long userId = userServiceImpl.getUserId(request);
+            Long userId = userService.getUserId(request);
             if(userId!=null) {
                 String clientIp = getLocalIp(request);
                 String createTime = Tools.getNow3();
diff --git a/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java b/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java
index 63de8ef6..ba698f5a 100644
--- a/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java
+++ b/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelComponent.java
@@ -14,15 +14,15 @@
 @Service
 @OrgaUserRelResource
 public class OrgaUserRelComponent implements ICommonQuery {
-    private final OrgaUserRelService orgaUserRelService;
+    private final OrgaUserRelServiceImpl orgaUserRelServiceImpl;
 
-    public OrgaUserRelComponent(OrgaUserRelService orgaUserRelService) {
-        this.orgaUserRelService = orgaUserRelService;
+    public OrgaUserRelComponent(OrgaUserRelServiceImpl orgaUserRelServiceImpl) {
+        this.orgaUserRelServiceImpl = orgaUserRelServiceImpl;
     }
 
     @Override
     public Object selectOne(Long id) throws Exception {
-        return orgaUserRelService.getOrgaUserRel(id);
+        return orgaUserRelServiceImpl.getOrgaUserRel(id);
     }
 
     @Override
@@ -39,22 +39,22 @@ public Long counts(Map<String, String> parameterMap)throws Exception {
 
     @Override
     public int insert(JSONObject obj, HttpServletRequest request)throws Exception {
-        return orgaUserRelService.insertOrgaUserRel(obj,request);
+        return orgaUserRelServiceImpl.insertOrgaUserRel(obj,request);
     }
 
     @Override
     public int update(JSONObject obj, HttpServletRequest request)throws Exception {
-        return orgaUserRelService.updateOrgaUserRel(obj, request);
+        return orgaUserRelServiceImpl.updateOrgaUserRel(obj, request);
     }
 
     @Override
     public int delete(Long id, HttpServletRequest request)throws Exception {
-        return orgaUserRelService.deleteOrgaUserRel(id, request);
+        return orgaUserRelServiceImpl.deleteOrgaUserRel(id, request);
     }
 
     @Override
     public int deleteBatch(String ids, HttpServletRequest request)throws Exception {
-        return orgaUserRelService.batchDeleteOrgaUserRel(ids, request);
+        return orgaUserRelServiceImpl.batchDeleteOrgaUserRel(ids, request);
     }
 
     @Override
diff --git a/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java b/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java
index 2f411a56..e0ad646c 100644
--- a/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java
+++ b/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelService.java
@@ -1,219 +1,29 @@
 package com.wansensoft.service.orgaUserRel;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.wansensoft.entities.organization.OrgaUserRel;
-import com.wansensoft.entities.organization.OrgaUserRelExample;
-import com.wansensoft.entities.user.User;
-import com.wansensoft.mappers.organization.OrgaUserRelMapper;
-import com.wansensoft.mappers.organization.OrgaUserRelMapperEx;
-import com.wansensoft.service.log.LogService;
-import com.wansensoft.service.user.UserService;
-import com.wansensoft.utils.constants.BusinessConstants;
-import com.wansensoft.plugins.exception.JshException;
-import com.wansensoft.service.organization.OrganizationService;
-import com.wansensoft.service.redis.RedisService;
-import com.wansensoft.utils.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import jakarta.servlet.http.HttpServletRequest;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-/**
- * Description
- */
-@Service
-public class OrgaUserRelService {
-    private Logger logger = LoggerFactory.getLogger(OrganizationService.class);
+public interface OrgaUserRelService extends IService<OrgaUserRel> {
+
+    OrgaUserRel getOrgaUserRel(long id);
+
+    int insertOrgaUserRel(JSONObject obj, HttpServletRequest request);
 
-    private final OrgaUserRelMapper orgaUserRelMapper;
-    private final OrgaUserRelMapperEx orgaUserRelMapperEx;
-    private final RedisService redisService;
-    private final OrganizationService organizationService;
-    private final LogService logService;
-    private final UserService userService;
+    int updateOrgaUserRel(JSONObject obj, HttpServletRequest request);
 
-    public OrgaUserRelService(OrgaUserRelMapper orgaUserRelMapper, OrgaUserRelMapperEx orgaUserRelMapperEx, RedisService redisService, OrganizationService organizationService, LogService logService, UserService userService) {
-        this.orgaUserRelMapper = orgaUserRelMapper;
-        this.orgaUserRelMapperEx = orgaUserRelMapperEx;
-        this.redisService = redisService;
-        this.organizationService = organizationService;
-        this.logService = logService;
-        this.userService = userService;
-    }
+    int deleteOrgaUserRel(Long id, HttpServletRequest request);
 
-    public OrgaUserRel getOrgaUserRel(long id) throws Exception{
-        return orgaUserRelMapper.selectByPrimaryKey(id);
-    }
+    int batchDeleteOrgaUserRel(String ids, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int insertOrgaUserRel(JSONObject obj, HttpServletRequest request) throws Exception{
-        OrgaUserRel orgaUserRel = JSONObject.parseObject(obj.toJSONString(), OrgaUserRel.class);
-        int result=0;
-        try{
-            result=orgaUserRelMapper.insertSelective(orgaUserRel);
-            logService.insertLog("用户与机构关系", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateOrgaUserRel(JSONObject obj, HttpServletRequest request) throws Exception{
-        OrgaUserRel orgaUserRel = JSONObject.parseObject(obj.toJSONString(), OrgaUserRel.class);
-        int result=0;
-        try{
-            result=orgaUserRelMapper.updateByPrimaryKeySelective(orgaUserRel);
-            logService.insertLog("用户与机构关系",
-                    BusinessConstants.LOG_OPERATION_TYPE_EDIT + orgaUserRel.getId(), request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteOrgaUserRel(Long id, HttpServletRequest request)throws Exception {
-        int result=0;
-        try{
-            result=orgaUserRelMapper.deleteByPrimaryKey(id);
-            logService.insertLog("用户与机构关系",
-                    BusinessConstants.LOG_OPERATION_TYPE_DELETE + id, request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteOrgaUserRel(String ids, HttpServletRequest request)throws Exception {
-        List<Long> idList = StringUtil.strToLongList(ids);
-        OrgaUserRelExample example = new OrgaUserRelExample();
-        example.createCriteria().andIdIn(idList);
-        int result=0;
-        try{
-            result=orgaUserRelMapper.deleteByExample(example);
-            logService.insertLog("用户与机构关系", "批量删除,id集:" + ids, request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    /**
-     * description:
-     *  新增机构用户关联关系,反显id
-     * @Param: orgaUserRel
-     * @return void
-     */
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public OrgaUserRel addOrgaUserRel(OrgaUserRel orgaUserRel) {
-        Date date = new Date();
-        User userInfo = userService.getCurrentUser();
-        //创建时间
-        if(orgaUserRel.getCreateTime()==null){
-            orgaUserRel.setCreateTime(date);
-        }
-        //创建人
-        if(orgaUserRel.getCreator()==null){
-            orgaUserRel.setCreator(userInfo==null?null:userInfo.getId());
-        }
-        //更新时间
-        if(orgaUserRel.getUpdateTime()==null){
-            orgaUserRel.setUpdateTime(date);
-        }
-        //更新人
-        if(orgaUserRel.getUpdater()==null){
-            orgaUserRel.setUpdater(userInfo==null?null:userInfo.getId());
-        }
-        orgaUserRel.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
-        int result=0;
-        try{
-            result=orgaUserRelMapperEx.addOrgaUserRel(orgaUserRel);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        if(result>0){
-            return orgaUserRel;
-        }
-        return null;
-    }
+    OrgaUserRel addOrgaUserRel(OrgaUserRel orgaUserRel);
 
-    /**
-     * description:
-     *  更新机构用户关联关系
-     * @Param: orgaUserRel
-     * @return void
-     */
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public OrgaUserRel updateOrgaUserRel(OrgaUserRel orgaUserRel) {
-        User userInfo = userService.getCurrentUser();
-        //更新时间
-        if(orgaUserRel.getUpdateTime()==null){
-            orgaUserRel.setUpdateTime(new Date());
-        }
-        //更新人
-        if(orgaUserRel.getUpdater()==null){
-            orgaUserRel.setUpdater(userInfo==null?null:userInfo.getId());
-        }
-        int result=0;
-        try{
-            result=orgaUserRelMapperEx.updateOrgaUserRel(orgaUserRel);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        if(result>0){
-            return orgaUserRel;
-        }
-        return null;
-    }
+    OrgaUserRel updateOrgaUserRel(OrgaUserRel orgaUserRel);
 
-    /**
-     * 根据用户id获取用户id列表
-     * @param userId
-     * @return
-     * @throws Exception
-     */
-    public String getUserIdListByUserId(Long userId) {
-        String users = "";
-        OrgaUserRelExample example = new OrgaUserRelExample();
-        example.createCriteria().andUserIdEqualTo(userId);
-        List<OrgaUserRel> list = orgaUserRelMapper.selectByExample(example);
-        if(list!=null && !list.isEmpty()) {
-            OrgaUserRel our = list.get(0);
-            List<Long> userIdList = getUserIdListByOrgId(our.getOrgaId());
-            for(Long u: userIdList){
-                users = users + u + ",";
-            }
-            if(!users.isEmpty()){
-                users = users.substring(0,users.length()-1);
-            }
-        }
-        return users;
-    }
+    String getUserIdListByUserId(Long userId);
 
-    /**
-     * 根据组织id获取所属的用户id列表（包含组织的递归）
-     * @param orgId
-     * @return
-     */
-    public List<Long> getUserIdListByOrgId(Long orgId) {
-        List<Long> orgIdList = organizationService.getOrgIdByParentId(orgId);
-        List<Long> userIdList = new ArrayList<Long>();
-        OrgaUserRelExample example = new OrgaUserRelExample();
-        if(orgIdList!=null && orgIdList.size()>0) {
-            example.createCriteria().andOrgaIdIn(orgIdList).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        } else {
-            example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        }
-        List<OrgaUserRel> list = orgaUserRelMapper.selectByExample(example);
-        if(list!=null && list.size()>0) {
-            for(OrgaUserRel our: list) {
-                userIdList.add(our.getUserId());
-            }
-        }
-        return  userIdList;
-    }
+    List<Long> getUserIdListByOrgId(Long orgId);
 }
diff --git a/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelServiceImpl.java b/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelServiceImpl.java
new file mode 100644
index 00000000..45fc27e9
--- /dev/null
+++ b/service/src/main/java/com/wansensoft/service/orgaUserRel/OrgaUserRelServiceImpl.java
@@ -0,0 +1,221 @@
+package com.wansensoft.service.orgaUserRel;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wansensoft.entities.organization.OrgaUserRel;
+import com.wansensoft.entities.organization.OrgaUserRelExample;
+import com.wansensoft.entities.user.User;
+import com.wansensoft.mappers.organization.OrgaUserRelMapper;
+import com.wansensoft.mappers.organization.OrgaUserRelMapperEx;
+import com.wansensoft.service.log.LogService;
+import com.wansensoft.service.organization.OrganizationService;
+import com.wansensoft.service.organization.OrganizationServiceImpl;
+import com.wansensoft.service.user.UserService;
+import com.wansensoft.utils.constants.BusinessConstants;
+import com.wansensoft.plugins.exception.JshException;
+import com.wansensoft.service.redis.RedisService;
+import com.wansensoft.utils.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description
+ */
+@Service
+public class OrgaUserRelServiceImpl extends ServiceImpl<OrgaUserRelMapper, OrgaUserRel> implements OrgaUserRelService{
+    private Logger logger = LoggerFactory.getLogger(OrganizationServiceImpl.class);
+
+    private final OrgaUserRelMapper orgaUserRelMapper;
+    private final OrgaUserRelMapperEx orgaUserRelMapperEx;
+    private final RedisService redisService;
+    private final OrganizationService organizationService;
+    private final LogService logService;
+    private final UserService userService;
+
+    public OrgaUserRelServiceImpl(OrgaUserRelMapper orgaUserRelMapper, OrgaUserRelMapperEx orgaUserRelMapperEx, RedisService redisService, OrganizationService organizationService, LogService logService, UserService userService) {
+        this.orgaUserRelMapper = orgaUserRelMapper;
+        this.orgaUserRelMapperEx = orgaUserRelMapperEx;
+        this.redisService = redisService;
+        this.organizationService = organizationService;
+        this.logService = logService;
+        this.userService = userService;
+    }
+
+    public OrgaUserRel getOrgaUserRel(long id) {
+        return orgaUserRelMapper.selectByPrimaryKey(id);
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int insertOrgaUserRel(JSONObject obj, HttpServletRequest request) {
+        OrgaUserRel orgaUserRel = JSONObject.parseObject(obj.toJSONString(), OrgaUserRel.class);
+        int result=0;
+        try{
+            result=orgaUserRelMapper.insertSelective(orgaUserRel);
+            logService.insertLog("用户与机构关系", BusinessConstants.LOG_OPERATION_TYPE_ADD, request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int updateOrgaUserRel(JSONObject obj, HttpServletRequest request) {
+        OrgaUserRel orgaUserRel = JSONObject.parseObject(obj.toJSONString(), OrgaUserRel.class);
+        int result=0;
+        try{
+            result=orgaUserRelMapper.updateByPrimaryKeySelective(orgaUserRel);
+            logService.insertLog("用户与机构关系",
+                    BusinessConstants.LOG_OPERATION_TYPE_EDIT + orgaUserRel.getId(), request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int deleteOrgaUserRel(Long id, HttpServletRequest request) {
+        int result=0;
+        try{
+            result=orgaUserRelMapper.deleteByPrimaryKey(id);
+            logService.insertLog("用户与机构关系",
+                    BusinessConstants.LOG_OPERATION_TYPE_DELETE + id, request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteOrgaUserRel(String ids, HttpServletRequest request) {
+        List<Long> idList = StringUtil.strToLongList(ids);
+        OrgaUserRelExample example = new OrgaUserRelExample();
+        example.createCriteria().andIdIn(idList);
+        int result=0;
+        try{
+            result=orgaUserRelMapper.deleteByExample(example);
+            logService.insertLog("用户与机构关系", "批量删除,id集:" + ids, request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    /**
+     * description:
+     *  新增机构用户关联关系,反显id
+     * @Param: orgaUserRel
+     * @return void
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public OrgaUserRel addOrgaUserRel(OrgaUserRel orgaUserRel) {
+        Date date = new Date();
+        User userInfo = userService.getCurrentUser();
+        //创建时间
+        if(orgaUserRel.getCreateTime()==null){
+            orgaUserRel.setCreateTime(date);
+        }
+        //创建人
+        if(orgaUserRel.getCreator()==null){
+            orgaUserRel.setCreator(userInfo==null?null:userInfo.getId());
+        }
+        //更新时间
+        if(orgaUserRel.getUpdateTime()==null){
+            orgaUserRel.setUpdateTime(date);
+        }
+        //更新人
+        if(orgaUserRel.getUpdater()==null){
+            orgaUserRel.setUpdater(userInfo==null?null:userInfo.getId());
+        }
+        orgaUserRel.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS);
+        int result=0;
+        try{
+            result=orgaUserRelMapperEx.addOrgaUserRel(orgaUserRel);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        if(result>0){
+            return orgaUserRel;
+        }
+        return null;
+    }
+
+    /**
+     * description:
+     *  更新机构用户关联关系
+     * @Param: orgaUserRel
+     * @return void
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public OrgaUserRel updateOrgaUserRel(OrgaUserRel orgaUserRel) {
+        User userInfo = userService.getCurrentUser();
+        //更新时间
+        if(orgaUserRel.getUpdateTime()==null){
+            orgaUserRel.setUpdateTime(new Date());
+        }
+        //更新人
+        if(orgaUserRel.getUpdater()==null){
+            orgaUserRel.setUpdater(userInfo==null?null:userInfo.getId());
+        }
+        int result=0;
+        try{
+            result=orgaUserRelMapperEx.updateOrgaUserRel(orgaUserRel);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        if(result>0){
+            return orgaUserRel;
+        }
+        return null;
+    }
+
+    /**
+     * 根据用户id获取用户id列表
+     * @param userId
+     * @return
+     * @throws Exception
+     */
+    public String getUserIdListByUserId(Long userId) {
+        String users = "";
+        OrgaUserRelExample example = new OrgaUserRelExample();
+        example.createCriteria().andUserIdEqualTo(userId);
+        List<OrgaUserRel> list = orgaUserRelMapper.selectByExample(example);
+        if(list!=null && !list.isEmpty()) {
+            OrgaUserRel our = list.get(0);
+            List<Long> userIdList = getUserIdListByOrgId(our.getOrgaId());
+            for(Long u: userIdList){
+                users = users + u + ",";
+            }
+            if(!users.isEmpty()){
+                users = users.substring(0,users.length()-1);
+            }
+        }
+        return users;
+    }
+
+    /**
+     * 根据组织id获取所属的用户id列表（包含组织的递归）
+     * @param orgId
+     * @return
+     */
+    public List<Long> getUserIdListByOrgId(Long orgId) {
+        List<Long> orgIdList = organizationService.getOrgIdByParentId(orgId);
+        List<Long> userIdList = new ArrayList<Long>();
+        OrgaUserRelExample example = new OrgaUserRelExample();
+        if(orgIdList!=null && !orgIdList.isEmpty()) {
+            example.createCriteria().andOrgaIdIn(orgIdList).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        } else {
+            example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        }
+        List<OrgaUserRel> list = orgaUserRelMapper.selectByExample(example);
+        if(list!=null && !list.isEmpty()) {
+            for(OrgaUserRel our: list) {
+                userIdList.add(our.getUserId());
+            }
+        }
+        return  userIdList;
+    }
+}
diff --git a/service/src/main/java/com/wansensoft/service/organization/OrganizationComponent.java b/service/src/main/java/com/wansensoft/service/organization/OrganizationComponent.java
index 7a070086..fd4ad540 100644
--- a/service/src/main/java/com/wansensoft/service/organization/OrganizationComponent.java
+++ b/service/src/main/java/com/wansensoft/service/organization/OrganizationComponent.java
@@ -15,15 +15,15 @@
 @OrganizationResource
 public class OrganizationComponent implements ICommonQuery {
 
-    private final OrganizationService organizationService;
+    private final OrganizationServiceImpl organizationServiceImpl;
 
-    public OrganizationComponent(OrganizationService organizationService) {
-        this.organizationService = organizationService;
+    public OrganizationComponent(OrganizationServiceImpl organizationServiceImpl) {
+        this.organizationServiceImpl = organizationServiceImpl;
     }
 
     @Override
     public Object selectOne(Long id) throws Exception {
-        return organizationService.getOrganization(id);
+        return organizationServiceImpl.getOrganization(id);
     }
 
     @Override
@@ -40,26 +40,26 @@ public Long counts(Map<String, String> parameterMap)throws Exception {
 
     @Override
     public int insert(JSONObject obj, HttpServletRequest request)throws Exception {
-        return organizationService.insertOrganization(obj,request);
+        return organizationServiceImpl.insertOrganization(obj,request);
     }
 
     @Override
     public int update(JSONObject obj, HttpServletRequest request)throws Exception {
-        return organizationService.updateOrganization(obj, request);
+        return organizationServiceImpl.updateOrganization(obj, request);
     }
 
     @Override
     public int delete(Long id, HttpServletRequest request)throws Exception {
-        return organizationService.deleteOrganization(id, request);
+        return organizationServiceImpl.deleteOrganization(id, request);
     }
 
     @Override
     public int deleteBatch(String ids, HttpServletRequest request)throws Exception {
-        return organizationService.batchDeleteOrganization(ids, request);
+        return organizationServiceImpl.batchDeleteOrganization(ids, request);
     }
 
     @Override
     public int checkIsNameExist(Long id, String name)throws Exception {
-        return organizationService.checkIsNameExist(id, name);
+        return organizationServiceImpl.checkIsNameExist(id, name);
     }
 }
diff --git a/service/src/main/java/com/wansensoft/service/organization/OrganizationService.java b/service/src/main/java/com/wansensoft/service/organization/OrganizationService.java
index 48f957f6..d23ab5bd 100644
--- a/service/src/main/java/com/wansensoft/service/organization/OrganizationService.java
+++ b/service/src/main/java/com/wansensoft/service/organization/OrganizationService.java
@@ -1,321 +1,46 @@
 package com.wansensoft.service.organization;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.wansensoft.entities.organization.Organization;
-import com.wansensoft.entities.organization.OrganizationExample;
-import com.wansensoft.entities.user.User;
-import com.wansensoft.service.log.LogService;
-import com.wansensoft.utils.constants.BusinessConstants;
-import com.wansensoft.utils.constants.ExceptionConstants;
-import com.wansensoft.plugins.exception.BusinessRunTimeException;
-import com.wansensoft.plugins.exception.JshException;
-import com.wansensoft.mappers.organization.OrganizationMapper;
-import com.wansensoft.mappers.organization.OrganizationMapperEx;
-import com.wansensoft.utils.StringUtil;
 import com.wansensoft.vo.TreeNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
-/**
- * Description
- */
-@Service
-public class OrganizationService {
-    private Logger logger = LoggerFactory.getLogger(OrganizationService.class);
+import java.util.List;
 
-    private final OrganizationMapper organizationMapper;
-    private final OrganizationMapperEx organizationMapperEx;
-    private final LogService logService;
+public interface OrganizationService extends IService<Organization> {
 
-    public OrganizationService(OrganizationMapper organizationMapper, OrganizationMapperEx organizationMapperEx, LogService logService) {
-        this.organizationMapper = organizationMapper;
-        this.organizationMapperEx = organizationMapperEx;
-        this.logService = logService;
-    }
+    Organization getOrganization(long id);
 
-    public Organization getOrganization(long id) throws Exception {
-        return organizationMapper.selectByPrimaryKey(id);
-    }
+    List<Organization> getOrganizationListByIds(String ids);
 
-    public List<Organization> getOrganizationListByIds(String ids)throws Exception {
-        List<Long> idList = StringUtil.strToLongList(ids);
-        List<Organization> list = new ArrayList<>();
-        try{
-            OrganizationExample example = new OrganizationExample();
-            example.createCriteria().andIdIn(idList);
-            list = organizationMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
+    int insertOrganization(JSONObject obj, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int insertOrganization(JSONObject obj, HttpServletRequest request)throws Exception {
-        Organization organization = JSONObject.parseObject(obj.toJSONString(), Organization.class);
-        organization.setCreateTime(new Date());
-        organization.setUpdateTime(new Date());
-        int result=0;
-        try{
-            result = organizationMapper.insertSelective(organization);
+    int updateOrganization(JSONObject obj, HttpServletRequest request);
 
-            logService.insertLog("机构",
-                    BusinessConstants.LOG_OPERATION_TYPE_ADD + organization.getOrgAbr(),request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateOrganization(JSONObject obj, HttpServletRequest request)throws Exception {
-        Organization organization = JSONObject.parseObject(obj.toJSONString(), Organization.class);
-        organization.setUpdateTime(new Date());
-        int result=0;
-        try{
-            result=organizationMapper.updateByPrimaryKeySelective(organization);
-            logService.insertLog("机构",
-                    BusinessConstants.LOG_OPERATION_TYPE_EDIT + organization.getOrgAbr(), request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
+    int deleteOrganization(Long id, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteOrganization(Long id, HttpServletRequest request)throws Exception {
-        return batchDeleteOrganizationByIds(id.toString());
-    }
+    int batchDeleteOrganization(String ids, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteOrganization(String ids, HttpServletRequest request)throws Exception {
-        return batchDeleteOrganizationByIds(ids);
-    }
+    int batchDeleteOrganizationByIds(String ids);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteOrganizationByIds(String ids) throws Exception{
-        StringBuffer sb = new StringBuffer();
-        sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
-        List<Organization> list = getOrganizationListByIds(ids);
-        for(Organization organization: list){
-            sb.append("[").append(organization.getOrgAbr()).append("]");
-        }
-        logService.insertLog("机构", sb.toString(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-       // User userInfo=userService.getCurrentUser();
-        User userInfo= null;
-        String [] idArray=ids.split(",");
-        int result=0;
-        List <Organization> organList = organizationMapperEx.getOrganizationByParentIds(idArray);
-        if(organList!=null && organList.size()>0) {
-            //如果存在子机构则不能删除
-            logger.error("异常码[{}],异常提示[{}]",
-                    ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_CODE,ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_MSG);
-            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_CODE,
-                    ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_MSG);
-        } else {
-            result=organizationMapperEx.batchDeleteOrganizationByIds(
-                    new Date(),userInfo==null?null:userInfo.getId(),idArray);
-        }
-        return result;
-    }
+    int checkIsNameExist(Long id, String name);
 
-    public int checkIsNameExist(Long id, String name)throws Exception {
-        OrganizationExample example = new OrganizationExample();
-        example.createCriteria().andIdNotEqualTo(id).andOrgAbrEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<Organization> list=null;
-        try{
-            list= organizationMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list==null?0:list.size();
-    }
+    int addOrganization(Organization org);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int addOrganization(Organization org) throws Exception{
-        logService.insertLog("机构",
-                BusinessConstants.LOG_OPERATION_TYPE_ADD + org.getOrgAbr(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        //新增时间
-        Date date=new Date();
-        // User userInfo=userService.getCurrentUser();
-        User userInfo= null;
-        org.setCreateTime(date);
-        //修改时间
-        org.setUpdateTime(date);
-        /**
-         *添加的时候检测机构编号是否已存在
-         * */
-        if(StringUtil.isNotEmpty(org.getOrgNo())){
-            checkOrgNoIsExists(org.getOrgNo(),null);
-        }
-        /**
-         * 未指定父级机构的时候默认为根机构
-         * */
-        if(org.getParentId()!=null){
-            org.setParentId(null);
-        }
-        int result=0;
-        try{
-            result=organizationMapperEx.addOrganization(org);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int editOrganization(Organization org)throws Exception {
-        logService.insertLog("机构",
-                BusinessConstants.LOG_OPERATION_TYPE_EDIT + org.getOrgAbr(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        //修改时间
-        org.setUpdateTime(new Date());
-        // User userInfo=userService.getCurrentUser();
-        User userInfo= null;
-        /**
-         * 修改的时候检测机构编号是否已存在
-         * */
-        if(StringUtil.isNotEmpty(org.getOrgNo())){
-            checkOrgNoIsExists(org.getOrgNo(),org.getId());
-        }
-        /**
-         * 未指定父级机构的时候默认为根机构
-         * */
-        if(org.getParentId()!=null){
-            org.setParentId(null);
-        }
-        int result=0;
-        try{
-            result=organizationMapperEx.editOrganization(org);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
+    int editOrganization(Organization org);
 
-    public List<TreeNode> getOrganizationTree(Long id)throws Exception {
-        List<TreeNode> list=null;
-        try{
-            list=organizationMapperEx.getNodeTree(id);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
+    List<TreeNode> getOrganizationTree(Long id);
 
-    public List<Organization> findById(Long id) throws Exception{
-        OrganizationExample example = new OrganizationExample();
-        example.createCriteria().andIdEqualTo(id);
-        List<Organization> list=null;
-        try{
-            list=organizationMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
+    List<Organization> findById(Long id);
 
-    public List<Organization> findByParentId(Long parentId)throws Exception {
-        List<Organization> list=null;
-        if(parentId!=null){
-            OrganizationExample example = new OrganizationExample();
-            example.createCriteria().andIdEqualTo(parentId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-            try{
-                list=organizationMapper.selectByExample(example);
-            }catch(Exception e){
-                JshException.readFail(logger, e);
-            }
-        }
-        return list;
-    }
+    List<Organization> findByParentId(Long parentId);
 
-    public List<Organization> findByOrgNo(String orgNo)throws Exception {
-        OrganizationExample example = new OrganizationExample();
-        example.createCriteria().andOrgNoEqualTo(orgNo).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<Organization> list=null;
-        try{
-            list=organizationMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
-    /**
-     * create by: cjl
-     * description:
-     *  检查机构编号是否已经存在
-     * create time: 2019/3/7 10:01
-     * @Param: orgNo
-     * @return void
-     */
-    public void checkOrgNoIsExists(String orgNo,Long id)throws Exception {
-        List<Organization> orgList=findByOrgNo(orgNo);
-        if(orgList!=null&&orgList.size()>0){
-            if(orgList.size()>1){
-                logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]",
-                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo);
-                //获取的数据条数大于1，机构编号已存在
-                throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,
-                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG);
-            }
-            if(id!=null){
-                if(!orgList.get(0).getId().equals(id)){
-                    //数据条数等于1，但是和编辑的数据的id不相同
-                    logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}],id[{}]",
-                            ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo,id);
-                    throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,
-                            ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG);
-                }
-            }else{
-                logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]",
-                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo);
-                //数据条数等于1，但此时是新增
-                throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,
-                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG);
-            }
-        }
+    List<Organization> findByOrgNo(String orgNo);
 
-    }
+    void checkOrgNoIsExists(String orgNo,Long id);
 
-    /**
-     * 根据父级id递归获取子集组织id
-     * @return
-     */
-    public List<Long> getOrgIdByParentId(Long orgId) {
-        List<Long> idList = new ArrayList<>();
-        OrganizationExample example = new OrganizationExample();
-        example.createCriteria().andIdEqualTo(orgId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<Organization> orgList = organizationMapper.selectByExample(example);
-        if(orgList!=null && orgList.size()>0) {
-            idList.add(orgId);
-            getOrgIdByParentNo(idList, orgList.get(0).getId());
-        }
-        return idList;
-    }
+    List<Long> getOrgIdByParentId(Long orgId);
 
-    /**
-     * 根据组织编号递归获取下级编号
-     * @param id
-     * @return
-     */
-    public void getOrgIdByParentNo(List<Long> idList,Long id) {
-        OrganizationExample example = new OrganizationExample();
-        example.createCriteria().andParentIdEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<Organization> orgList = organizationMapper.selectByExample(example);
-        if(orgList!=null && orgList.size()>0) {
-            for(Organization o: orgList) {
-                idList.add(o.getId());
-                getOrgIdByParentNo(idList, o.getId());
-            }
-        }
-    }
+    void getOrgIdByParentNo(List<Long> idList,Long id);
 }
diff --git a/service/src/main/java/com/wansensoft/service/organization/OrganizationServiceImpl.java b/service/src/main/java/com/wansensoft/service/organization/OrganizationServiceImpl.java
new file mode 100644
index 00000000..a03c4829
--- /dev/null
+++ b/service/src/main/java/com/wansensoft/service/organization/OrganizationServiceImpl.java
@@ -0,0 +1,320 @@
+package com.wansensoft.service.organization;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wansensoft.entities.organization.Organization;
+import com.wansensoft.entities.organization.OrganizationExample;
+import com.wansensoft.entities.user.User;
+import com.wansensoft.service.log.LogService;
+import com.wansensoft.utils.constants.BusinessConstants;
+import com.wansensoft.utils.constants.ExceptionConstants;
+import com.wansensoft.plugins.exception.BusinessRunTimeException;
+import com.wansensoft.plugins.exception.JshException;
+import com.wansensoft.mappers.organization.OrganizationMapper;
+import com.wansensoft.mappers.organization.OrganizationMapperEx;
+import com.wansensoft.utils.StringUtil;
+import com.wansensoft.vo.TreeNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description
+ */
+@Service
+public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements OrganizationService{
+    private Logger logger = LoggerFactory.getLogger(OrganizationServiceImpl.class);
+
+    private final OrganizationMapper organizationMapper;
+    private final OrganizationMapperEx organizationMapperEx;
+    private final LogService logService;
+
+    public OrganizationServiceImpl(OrganizationMapper organizationMapper, OrganizationMapperEx organizationMapperEx, LogService logService) {
+        this.organizationMapper = organizationMapper;
+        this.organizationMapperEx = organizationMapperEx;
+        this.logService = logService;
+    }
+
+    public Organization getOrganization(long id) {
+        return organizationMapper.selectByPrimaryKey(id);
+    }
+
+    public List<Organization> getOrganizationListByIds(String ids) {
+        List<Long> idList = StringUtil.strToLongList(ids);
+        List<Organization> list = new ArrayList<>();
+        try{
+            OrganizationExample example = new OrganizationExample();
+            example.createCriteria().andIdIn(idList);
+            list = organizationMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int insertOrganization(JSONObject obj, HttpServletRequest request) {
+        Organization organization = JSONObject.parseObject(obj.toJSONString(), Organization.class);
+        organization.setCreateTime(new Date());
+        organization.setUpdateTime(new Date());
+        int result=0;
+        try{
+            result = organizationMapper.insertSelective(organization);
+
+            logService.insertLog("机构",
+                    BusinessConstants.LOG_OPERATION_TYPE_ADD + organization.getOrgAbr(),request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int updateOrganization(JSONObject obj, HttpServletRequest request) {
+        Organization organization = JSONObject.parseObject(obj.toJSONString(), Organization.class);
+        organization.setUpdateTime(new Date());
+        int result=0;
+        try{
+            result=organizationMapper.updateByPrimaryKeySelective(organization);
+            logService.insertLog("机构",
+                    BusinessConstants.LOG_OPERATION_TYPE_EDIT + organization.getOrgAbr(), request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int deleteOrganization(Long id, HttpServletRequest request) {
+        return batchDeleteOrganizationByIds(id.toString());
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteOrganization(String ids, HttpServletRequest request) {
+        return batchDeleteOrganizationByIds(ids);
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteOrganizationByIds(String ids) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
+        List<Organization> list = getOrganizationListByIds(ids);
+        for(Organization organization: list){
+            sb.append("[").append(organization.getOrgAbr()).append("]");
+        }
+        logService.insertLog("机构", sb.toString(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+       // User userInfo=userService.getCurrentUser();
+        User userInfo= null;
+        String [] idArray=ids.split(",");
+        int result=0;
+        List <Organization> organList = organizationMapperEx.getOrganizationByParentIds(idArray);
+        if(organList!=null && !organList.isEmpty()) {
+            //如果存在子机构则不能删除
+            logger.error("异常码[{}],异常提示[{}]",
+                    ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_CODE,ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_MSG);
+            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_CODE,
+                    ExceptionConstants.ORGANIZATION_CHILD_NOT_ALLOWED_DELETE_MSG);
+        } else {
+            result=organizationMapperEx.batchDeleteOrganizationByIds(
+                    new Date(),userInfo==null?null:userInfo.getId(),idArray);
+        }
+        return result;
+    }
+
+    public int checkIsNameExist(Long id, String name) {
+        OrganizationExample example = new OrganizationExample();
+        example.createCriteria().andIdNotEqualTo(id).andOrgAbrEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<Organization> list=null;
+        try{
+            list= organizationMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list==null?0:list.size();
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int addOrganization(Organization org) {
+        logService.insertLog("机构",
+                BusinessConstants.LOG_OPERATION_TYPE_ADD + org.getOrgAbr(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        //新增时间
+        Date date=new Date();
+        // User userInfo=userService.getCurrentUser();
+        User userInfo= null;
+        org.setCreateTime(date);
+        //修改时间
+        org.setUpdateTime(date);
+        /**
+         *添加的时候检测机构编号是否已存在
+         * */
+        if(StringUtil.isNotEmpty(org.getOrgNo())){
+            checkOrgNoIsExists(org.getOrgNo(),null);
+        }
+        /**
+         * 未指定父级机构的时候默认为根机构
+         * */
+        if(org.getParentId()!=null){
+            org.setParentId(null);
+        }
+        int result=0;
+        try{
+            result=organizationMapperEx.addOrganization(org);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int editOrganization(Organization org) {
+        logService.insertLog("机构",
+                BusinessConstants.LOG_OPERATION_TYPE_EDIT + org.getOrgAbr(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        //修改时间
+        org.setUpdateTime(new Date());
+        // User userInfo=userService.getCurrentUser();
+        User userInfo= null;
+        /**
+         * 修改的时候检测机构编号是否已存在
+         * */
+        if(StringUtil.isNotEmpty(org.getOrgNo())){
+            checkOrgNoIsExists(org.getOrgNo(),org.getId());
+        }
+        /**
+         * 未指定父级机构的时候默认为根机构
+         * */
+        if(org.getParentId()!=null){
+            org.setParentId(null);
+        }
+        int result=0;
+        try{
+            result=organizationMapperEx.editOrganization(org);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+
+    public List<TreeNode> getOrganizationTree(Long id) {
+        List<TreeNode> list=null;
+        try{
+            list=organizationMapperEx.getNodeTree(id);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<Organization> findById(Long id) {
+        OrganizationExample example = new OrganizationExample();
+        example.createCriteria().andIdEqualTo(id);
+        List<Organization> list=null;
+        try{
+            list=organizationMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<Organization> findByParentId(Long parentId) {
+        List<Organization> list=null;
+        if(parentId!=null){
+            OrganizationExample example = new OrganizationExample();
+            example.createCriteria().andIdEqualTo(parentId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+            try{
+                list=organizationMapper.selectByExample(example);
+            }catch(Exception e){
+                JshException.readFail(logger, e);
+            }
+        }
+        return list;
+    }
+
+    public List<Organization> findByOrgNo(String orgNo) {
+        OrganizationExample example = new OrganizationExample();
+        example.createCriteria().andOrgNoEqualTo(orgNo).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<Organization> list=null;
+        try{
+            list=organizationMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+    /**
+     * description:
+     *  检查机构编号是否已经存在
+     * @Param: orgNo
+     * @return void
+     */
+    public void checkOrgNoIsExists(String orgNo,Long id) {
+        List<Organization> orgList=findByOrgNo(orgNo);
+        if(orgList!=null&&orgList.size()>0){
+            if(orgList.size()>1){
+                logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]",
+                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo);
+                //获取的数据条数大于1，机构编号已存在
+                throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,
+                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG);
+            }
+            if(id!=null){
+                if(!orgList.get(0).getId().equals(id)){
+                    //数据条数等于1，但是和编辑的数据的id不相同
+                    logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}],id[{}]",
+                            ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo,id);
+                    throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,
+                            ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG);
+                }
+            }else{
+                logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]",
+                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo);
+                //数据条数等于1，但此时是新增
+                throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,
+                        ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG);
+            }
+        }
+
+    }
+
+    /**
+     * 根据父级id递归获取子集组织id
+     * @return
+     */
+    public List<Long> getOrgIdByParentId(Long orgId) {
+        List<Long> idList = new ArrayList<>();
+        OrganizationExample example = new OrganizationExample();
+        example.createCriteria().andIdEqualTo(orgId).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<Organization> orgList = organizationMapper.selectByExample(example);
+        if(orgList!=null && !orgList.isEmpty()) {
+            idList.add(orgId);
+            getOrgIdByParentNo(idList, orgList.get(0).getId());
+        }
+        return idList;
+    }
+
+    /**
+     * 根据组织编号递归获取下级编号
+     * @param id
+     * @return
+     */
+    public void getOrgIdByParentNo(List<Long> idList,Long id) {
+        OrganizationExample example = new OrganizationExample();
+        example.createCriteria().andParentIdEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<Organization> orgList = organizationMapper.selectByExample(example);
+        if(orgList!=null && !orgList.isEmpty()) {
+            for(Organization o: orgList) {
+                idList.add(o.getId());
+                getOrgIdByParentNo(idList, o.getId());
+            }
+        }
+    }
+}
diff --git a/service/src/main/java/com/wansensoft/service/role/RoleComponent.java b/service/src/main/java/com/wansensoft/service/role/RoleComponent.java
index 6b70bb59..923465f5 100644
--- a/service/src/main/java/com/wansensoft/service/role/RoleComponent.java
+++ b/service/src/main/java/com/wansensoft/service/role/RoleComponent.java
@@ -15,15 +15,15 @@
 @RoleResource
 public class RoleComponent implements ICommonQuery {
 
-    private final RoleService roleService;
+    private final RoleServiceImpl roleServiceImpl;
 
-    public RoleComponent(RoleService roleService) {
-        this.roleService = roleService;
+    public RoleComponent(RoleServiceImpl roleServiceImpl) {
+        this.roleServiceImpl = roleServiceImpl;
     }
 
     @Override
     public Object selectOne(Long id) throws Exception {
-        return roleService.getRole(id);
+        return roleServiceImpl.getRole(id);
     }
 
     @Override
@@ -35,7 +35,7 @@ private List<?> getRoleList(Map<String, String> map) throws Exception{
         String search = map.get(Constants.SEARCH);
         String name = StringUtil.getInfo(search, "name");
         String description = StringUtil.getInfo(search, "description");
-        return roleService.select(name, description, QueryUtils.offset(map), QueryUtils.rows(map));
+        return roleServiceImpl.select(name, description, QueryUtils.offset(map), QueryUtils.rows(map));
     }
 
     @Override
@@ -43,32 +43,32 @@ public Long counts(Map<String, String> map) throws Exception{
         String search = map.get(Constants.SEARCH);
         String name = StringUtil.getInfo(search, "name");
         String description = StringUtil.getInfo(search, "description");
-        return roleService.countRole(name, description);
+        return roleServiceImpl.countRole(name, description);
     }
 
     @Override
     public int insert(JSONObject obj, HttpServletRequest request)throws Exception {
-        return roleService.insertRole(obj, request);
+        return roleServiceImpl.insertRole(obj, request);
     }
 
     @Override
     public int update(JSONObject obj, HttpServletRequest request)throws Exception {
-        return roleService.updateRole(obj, request);
+        return roleServiceImpl.updateRole(obj, request);
     }
 
     @Override
     public int delete(Long id, HttpServletRequest request)throws Exception {
-        return roleService.deleteRole(id, request);
+        return roleServiceImpl.deleteRole(id, request);
     }
 
     @Override
     public int deleteBatch(String ids, HttpServletRequest request)throws Exception {
-        return roleService.batchDeleteRole(ids, request);
+        return roleServiceImpl.batchDeleteRole(ids, request);
     }
 
     @Override
     public int checkIsNameExist(Long id, String name)throws Exception {
-        return roleService.checkIsNameExist(id, name);
+        return roleServiceImpl.checkIsNameExist(id, name);
     }
 
 }
diff --git a/service/src/main/java/com/wansensoft/service/role/RoleService.java b/service/src/main/java/com/wansensoft/service/role/RoleService.java
index 1e72b8a4..393f6467 100644
--- a/service/src/main/java/com/wansensoft/service/role/RoleService.java
+++ b/service/src/main/java/com/wansensoft/service/role/RoleService.java
@@ -1,297 +1,47 @@
 package com.wansensoft.service.role;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.wansensoft.entities.role.Role;
 import com.wansensoft.entities.role.RoleEx;
-import com.wansensoft.entities.role.RoleExample;
-import com.wansensoft.entities.user.User;
-import com.wansensoft.service.log.LogService;
-import com.wansensoft.service.user.UserService;
-import com.wansensoft.utils.constants.BusinessConstants;
-import com.wansensoft.plugins.exception.JshException;
-import com.wansensoft.mappers.role.RoleMapper;
-import com.wansensoft.mappers.role.RoleMapperEx;
-import com.wansensoft.utils.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
 import jakarta.servlet.http.HttpServletRequest;
+
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-@Service
-public class RoleService {
-    private Logger logger = LoggerFactory.getLogger(RoleService.class);
-
-    private final RoleMapper roleMapper;
-    private final RoleMapperEx roleMapperEx;
-    private final LogService logService;
-    private final UserService userService;
-
-    public RoleService(RoleMapper roleMapper, RoleMapperEx roleMapperEx, LogService logService, UserService userService) {
-        this.roleMapper = roleMapper;
-        this.roleMapperEx = roleMapperEx;
-        this.logService = logService;
-        this.userService = userService;
-    }
+public interface RoleService extends IService<Role> {
 
-    public Role getRole(long id) {
-        Role result=null;
-        try{
-            result=roleMapper.selectByPrimaryKey(id);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return result;
-    }
+    Role getRole(long id);
 
-    public List<Role> getRoleListByIds(String ids) {
-        List<Long> idList = StringUtil.strToLongList(ids);
-        List<Role> list = new ArrayList<>();
-        try{
-            RoleExample example = new RoleExample();
-            example.createCriteria().andIdIn(idList);
-            list = roleMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
+    List<Role> getRoleListByIds(String ids);
 
-    public List<Role> allList() {
-        RoleExample example = new RoleExample();
-        example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("sort asc, id desc");
-        List<Role> list=null;
-        try{
-            list=roleMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
+    List<Role> allList();
 
-    public List<RoleEx> select(String name, String description, int offset, int rows)throws Exception {
-        List<RoleEx> list=null;
-        try{
-            list=roleMapperEx.selectByConditionRole(name, description, offset, rows);
-            for(RoleEx roleEx: list) {
-                String priceLimit = roleEx.getPriceLimit();
-                if(StringUtil.isNotEmpty(priceLimit)) {
-                    String priceLimitStr = priceLimit
-                        .replace("1", "屏蔽首页采购价")
-                        .replace("2", "屏蔽首页零售价")
-                        .replace("3", "屏蔽首页销售价")
-                        .replace("4", "屏蔽单据采购价")
-                        .replace("5", "屏蔽单据零售价")
-                        .replace("6", "屏蔽单据销售价");
-                    roleEx.setPriceLimitStr(priceLimitStr);
-                }
-            }
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
+    List<RoleEx> select(String name, String description, int offset, int rows);
 
-    public Long countRole(String name, String description)throws Exception {
-        Long result=null;
-        try{
-            result=roleMapperEx.countsByRole(name, description);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return result;
-    }
+    Long countRole(String name, String description);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int insertRole(JSONObject obj, HttpServletRequest request)throws Exception {
-        Role role = JSONObject.parseObject(obj.toJSONString(), Role.class);
-        int result=0;
-        try{
-            role.setEnabled(true);
-            result=roleMapper.insertSelective(role);
-            logService.insertLog("角色",
-                    BusinessConstants.LOG_OPERATION_TYPE_ADD + role.getName(), request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
+    int insertRole(JSONObject obj, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int updateRole(JSONObject obj, HttpServletRequest request) {
-        Role role = JSONObject.parseObject(obj.toJSONString(), Role.class);
-        int result=0;
-        try{
-            result=roleMapper.updateByPrimaryKeySelective(role);
-            logService.insertLog("角色",
-                    BusinessConstants.LOG_OPERATION_TYPE_EDIT + role.getName(), request);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
+    int updateRole(JSONObject obj, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int deleteRole(Long id, HttpServletRequest request) {
-        return batchDeleteRoleByIds(id.toString());
-    }
+    int deleteRole(Long id, HttpServletRequest request);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteRole(String ids, HttpServletRequest request) {
-        return batchDeleteRoleByIds(ids);
-    }
+    int batchDeleteRole(String ids, HttpServletRequest request);
 
-    public int checkIsNameExist(Long id, String name) throws Exception{
-        RoleExample example = new RoleExample();
-        example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<Role> list =null;
-        try{
-            list=roleMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list==null?0:list.size();
-    }
+    List<Role> findUserRole();
 
-    public List<Role> findUserRole()throws Exception{
-        RoleExample example = new RoleExample();
-        example.setOrderByClause("Id");
-        example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        List<Role> list=null;
-        try{
-            list=roleMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
-    /**
-     *  逻辑删除角色信息
-     * @Param: ids
-     * @return int
-     */
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchDeleteRoleByIds(String ids) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
-        List<Role> list = getRoleListByIds(ids);
-        for(Role role: list){
-            sb.append("[").append(role.getName()).append("]");
-        }
-        logService.insertLog("角色", sb.toString(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        User userInfo = userService.getCurrentUser();
-        String [] idArray=ids.split(",");
-        int result=0;
-        try{
-            result=roleMapperEx.batchDeleteRoleByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
+    int batchDeleteRoleByIds(String ids);
 
-    public Role getRoleWithoutTenant(Long roleId) {
-        return roleMapperEx.getRoleWithoutTenant(roleId);
-    }
+    Role getRoleWithoutTenant(Long roleId);
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int batchSetStatus(Boolean status, String ids)throws Exception {
-        logService.insertLog("角色",
-                BusinessConstants.LOG_OPERATION_TYPE_ENABLED,
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        List<Long> roleIds = StringUtil.strToLongList(ids);
-        Role role = new Role();
-        role.setEnabled(status);
-        RoleExample example = new RoleExample();
-        example.createCriteria().andIdIn(roleIds);
-        int result=0;
-        try{
-            result = roleMapper.updateByExampleSelective(role, example);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
+    int batchSetStatus(Boolean status, String ids);
 
-    /**
-     * 根据权限进行屏蔽价格-首页
-     * @param price
-     * @param type
-     * @return
-     */
-    public Object parseHomePriceByLimit(BigDecimal price, String type, String priceLimit, String emptyInfo, HttpServletRequest request) {
-        if(StringUtil.isNotEmpty(priceLimit)) {
-            if("buy".equals(type) && priceLimit.contains("1")) {
-                return emptyInfo;
-            }
-            if("retail".equals(type) && priceLimit.contains("2")) {
-                return emptyInfo;
-            }
-            if("sale".equals(type) && priceLimit.contains("3")) {
-                return emptyInfo;
-            }
-        }
-        return price;
-    }
+    Object parseHomePriceByLimit(BigDecimal price, String type, String priceLimit, String emptyInfo, HttpServletRequest request);
 
-    /**
-     * 根据权限进行屏蔽价格-单据
-     * @param price
-     * @param billCategory
-     * @param priceLimit
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    public BigDecimal parseBillPriceByLimit(BigDecimal price, String billCategory, String priceLimit, HttpServletRequest request) {
-        if(StringUtil.isNotEmpty(priceLimit)) {
-            if("buy".equals(billCategory) && priceLimit.contains("4")) {
-                return BigDecimal.ZERO;
-            }
-            if("retail".equals(billCategory) && priceLimit.contains("5")) {
-                return BigDecimal.ZERO;
-            }
-            if("sale".equals(billCategory) && priceLimit.contains("6")) {
-                return BigDecimal.ZERO;
-            }
-        }
-        return price;
-    }
+    BigDecimal parseBillPriceByLimit(BigDecimal price, String billCategory, String priceLimit, HttpServletRequest request);
 
-    /**
-     * 根据权限进行屏蔽价格-物料
-     * @param price
-     * @param type
-     * @return
-     */
-    public Object parseMaterialPriceByLimit(BigDecimal price, String type, String emptyInfo, HttpServletRequest request) {
-        Long userId = userService.getUserId(request);
-        String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit();
-        if(StringUtil.isNotEmpty(priceLimit)) {
-            if("buy".equals(type) && priceLimit.contains("4")) {
-                return emptyInfo;
-            }
-            if("retail".equals(type) && priceLimit.contains("5")) {
-                return emptyInfo;
-            }
-            if("sale".equals(type) && priceLimit.contains("6")) {
-                return emptyInfo;
-            }
-        }
-        return price;
-    }
+    Object parseMaterialPriceByLimit(BigDecimal price, String type, String emptyInfo, HttpServletRequest request);
 
-    public String getCurrentPriceLimit(HttpServletRequest request) {
-        Long userId = userService.getUserId(request);
-        return userService.getRoleTypeByUserId(userId).getPriceLimit();
-    }
+    String getCurrentPriceLimit(HttpServletRequest request);
 }
diff --git a/service/src/main/java/com/wansensoft/service/role/RoleServiceImpl.java b/service/src/main/java/com/wansensoft/service/role/RoleServiceImpl.java
new file mode 100644
index 00000000..6e692306
--- /dev/null
+++ b/service/src/main/java/com/wansensoft/service/role/RoleServiceImpl.java
@@ -0,0 +1,298 @@
+package com.wansensoft.service.role;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wansensoft.entities.role.Role;
+import com.wansensoft.entities.role.RoleEx;
+import com.wansensoft.entities.role.RoleExample;
+import com.wansensoft.entities.user.User;
+import com.wansensoft.service.log.LogService;
+import com.wansensoft.service.user.UserService;
+import com.wansensoft.utils.constants.BusinessConstants;
+import com.wansensoft.plugins.exception.JshException;
+import com.wansensoft.mappers.role.RoleMapper;
+import com.wansensoft.mappers.role.RoleMapperEx;
+import com.wansensoft.utils.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService{
+    private Logger logger = LoggerFactory.getLogger(RoleServiceImpl.class);
+
+    private final RoleMapper roleMapper;
+    private final RoleMapperEx roleMapperEx;
+    private final LogService logService;
+    private final UserService userService;
+
+    public RoleServiceImpl(RoleMapper roleMapper, RoleMapperEx roleMapperEx, LogService logService, UserService userService) {
+        this.roleMapper = roleMapper;
+        this.roleMapperEx = roleMapperEx;
+        this.logService = logService;
+        this.userService = userService;
+    }
+
+    public Role getRole(long id) {
+        Role result=null;
+        try{
+            result=roleMapper.selectByPrimaryKey(id);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return result;
+    }
+
+    public List<Role> getRoleListByIds(String ids) {
+        List<Long> idList = StringUtil.strToLongList(ids);
+        List<Role> list = new ArrayList<>();
+        try{
+            RoleExample example = new RoleExample();
+            example.createCriteria().andIdIn(idList);
+            list = roleMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<Role> allList() {
+        RoleExample example = new RoleExample();
+        example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        example.setOrderByClause("sort asc, id desc");
+        List<Role> list=null;
+        try{
+            list=roleMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public List<RoleEx> select(String name, String description, int offset, int rows) {
+        List<RoleEx> list=null;
+        try{
+            list=roleMapperEx.selectByConditionRole(name, description, offset, rows);
+            for(RoleEx roleEx: list) {
+                String priceLimit = roleEx.getPriceLimit();
+                if(StringUtil.isNotEmpty(priceLimit)) {
+                    String priceLimitStr = priceLimit
+                        .replace("1", "屏蔽首页采购价")
+                        .replace("2", "屏蔽首页零售价")
+                        .replace("3", "屏蔽首页销售价")
+                        .replace("4", "屏蔽单据采购价")
+                        .replace("5", "屏蔽单据零售价")
+                        .replace("6", "屏蔽单据销售价");
+                    roleEx.setPriceLimitStr(priceLimitStr);
+                }
+            }
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+
+    public Long countRole(String name, String description) {
+        Long result=null;
+        try{
+            result=roleMapperEx.countsByRole(name, description);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return result;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int insertRole(JSONObject obj, HttpServletRequest request) {
+        Role role = JSONObject.parseObject(obj.toJSONString(), Role.class);
+        int result=0;
+        try{
+            role.setEnabled(true);
+            result=roleMapper.insertSelective(role);
+            logService.insertLog("角色",
+                    BusinessConstants.LOG_OPERATION_TYPE_ADD + role.getName(), request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int updateRole(JSONObject obj, HttpServletRequest request) {
+        Role role = JSONObject.parseObject(obj.toJSONString(), Role.class);
+        int result=0;
+        try{
+            result=roleMapper.updateByPrimaryKeySelective(role);
+            logService.insertLog("角色",
+                    BusinessConstants.LOG_OPERATION_TYPE_EDIT + role.getName(), request);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int deleteRole(Long id, HttpServletRequest request) {
+        return batchDeleteRoleByIds(id.toString());
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteRole(String ids, HttpServletRequest request) {
+        return batchDeleteRoleByIds(ids);
+    }
+
+    public int checkIsNameExist(Long id, String name) {
+        RoleExample example = new RoleExample();
+        example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<Role> list =null;
+        try{
+            list=roleMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list==null?0:list.size();
+    }
+
+    public List<Role> findUserRole() {
+        RoleExample example = new RoleExample();
+        example.setOrderByClause("Id");
+        example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        List<Role> list=null;
+        try{
+            list=roleMapper.selectByExample(example);
+        }catch(Exception e){
+            JshException.readFail(logger, e);
+        }
+        return list;
+    }
+    /**
+     *  逻辑删除角色信息
+     * @Param: ids
+     * @return int
+     */
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchDeleteRoleByIds(String ids) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
+        List<Role> list = getRoleListByIds(ids);
+        for(Role role: list){
+            sb.append("[").append(role.getName()).append("]");
+        }
+        logService.insertLog("角色", sb.toString(),
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        User userInfo = userService.getCurrentUser();
+        String [] idArray=ids.split(",");
+        int result=0;
+        try{
+            result=roleMapperEx.batchDeleteRoleByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+
+    public Role getRoleWithoutTenant(Long roleId) {
+        return roleMapperEx.getRoleWithoutTenant(roleId);
+    }
+
+    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
+    public int batchSetStatus(Boolean status, String ids) {
+        logService.insertLog("角色",
+                BusinessConstants.LOG_OPERATION_TYPE_ENABLED,
+                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        List<Long> roleIds = StringUtil.strToLongList(ids);
+        Role role = new Role();
+        role.setEnabled(status);
+        RoleExample example = new RoleExample();
+        example.createCriteria().andIdIn(roleIds);
+        int result=0;
+        try{
+            result = roleMapper.updateByExampleSelective(role, example);
+        }catch(Exception e){
+            JshException.writeFail(logger, e);
+        }
+        return result;
+    }
+
+    /**
+     * 根据权限进行屏蔽价格-首页
+     * @param price
+     * @param type
+     * @return
+     */
+    public Object parseHomePriceByLimit(BigDecimal price, String type, String priceLimit, String emptyInfo, HttpServletRequest request) {
+        if(StringUtil.isNotEmpty(priceLimit)) {
+            if("buy".equals(type) && priceLimit.contains("1")) {
+                return emptyInfo;
+            }
+            if("retail".equals(type) && priceLimit.contains("2")) {
+                return emptyInfo;
+            }
+            if("sale".equals(type) && priceLimit.contains("3")) {
+                return emptyInfo;
+            }
+        }
+        return price;
+    }
+
+    /**
+     * 根据权限进行屏蔽价格-单据
+     * @param price
+     * @param billCategory
+     * @param priceLimit
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    public BigDecimal parseBillPriceByLimit(BigDecimal price, String billCategory, String priceLimit, HttpServletRequest request) {
+        if(StringUtil.isNotEmpty(priceLimit)) {
+            if("buy".equals(billCategory) && priceLimit.contains("4")) {
+                return BigDecimal.ZERO;
+            }
+            if("retail".equals(billCategory) && priceLimit.contains("5")) {
+                return BigDecimal.ZERO;
+            }
+            if("sale".equals(billCategory) && priceLimit.contains("6")) {
+                return BigDecimal.ZERO;
+            }
+        }
+        return price;
+    }
+
+    /**
+     * 根据权限进行屏蔽价格-物料
+     * @param price
+     * @param type
+     * @return
+     */
+    public Object parseMaterialPriceByLimit(BigDecimal price, String type, String emptyInfo, HttpServletRequest request) {
+        Long userId = userService.getUserId(request);
+        String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit();
+        if(StringUtil.isNotEmpty(priceLimit)) {
+            if("buy".equals(type) && priceLimit.contains("4")) {
+                return emptyInfo;
+            }
+            if("retail".equals(type) && priceLimit.contains("5")) {
+                return emptyInfo;
+            }
+            if("sale".equals(type) && priceLimit.contains("6")) {
+                return emptyInfo;
+            }
+        }
+        return price;
+    }
+
+    public String getCurrentPriceLimit(HttpServletRequest request) {
+        Long userId = userService.getUserId(request);
+        return userService.getRoleTypeByUserId(userId).getPriceLimit();
+    }
+}
diff --git a/service/src/main/java/com/wansensoft/service/tenant/TenantExampleService.java b/service/src/main/java/com/wansensoft/service/tenant/TenantExampleService.java
new file mode 100644
index 00000000..a8c0f29e
--- /dev/null
+++ b/service/src/main/java/com/wansensoft/service/tenant/TenantExampleService.java
@@ -0,0 +1,11 @@
+package com.wansensoft.tenant;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wansensoft.entities.tenant.Tenant;
+import com.wansensoft.entities.tenant.TenantEx;
+import com.wansensoft.entities.tenant.TenantExample;
+
+public interface TenantExampleService extends IService<TenantEx> {
+
+    Tenant getTenantByTenantId(long tenantId);
+}
diff --git a/service/src/main/java/com/wansensoft/service/user/UserServiceImpl.java b/service/src/main/java/com/wansensoft/service/user/UserServiceImpl.java
index 93a8a3ee..c22c7e1f 100644
--- a/service/src/main/java/com/wansensoft/service/user/UserServiceImpl.java
+++ b/service/src/main/java/com/wansensoft/service/user/UserServiceImpl.java
@@ -13,6 +13,7 @@
 import com.wansensoft.mappers.user.UserMapperEx;
 import com.wansensoft.service.functions.FunctionService;
 import com.wansensoft.service.log.LogService;
+import com.wansensoft.service.orgaUserRel.OrgaUserRelService;
 import com.wansensoft.service.platformConfig.PlatformConfigService;
 import com.wansensoft.service.redis.RedisService;
 import com.wansensoft.service.role.RoleService;
@@ -30,7 +31,6 @@
 import com.wansensoft.utils.constants.ExceptionConstants;
 import com.wansensoft.plugins.exception.BusinessRunTimeException;
 import com.wansensoft.plugins.exception.JshException;
-import com.wansensoft.service.orgaUserRel.OrgaUserRelService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -512,7 +512,7 @@ public void addUserAndOrgUserRel(UserEx ue, HttpServletRequest request) {
             oul.setUserId(userId);
             //用户在机构中的排序
             oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq());
-            oul=orgaUserRelService.addOrgaUserRel(oul);
+            oul = orgaUserRelService.addOrgaUserRel(oul);
             if(oul==null){
                 logger.error("异常码[{}],异常提示[{}],参数,[{}]",
                         ExceptionConstants.ORGA_USER_REL_ADD_FAILED_CODE,ExceptionConstants.ORGA_USER_REL_ADD_FAILED_MSG);