diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
index f31430bf..fe806628 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
@@ -120,12 +120,12 @@ public class BaseAreaController extends ControllerBase {
     @PostMapping("del")
     @MethodInfoMark(value = "删除" ,menuName = "区域管理")
     @ApiMark(moduleName = "区域管理", apiName = "删除")
-    public ApiResult<Boolean> del(@RequestBody List<Long> ids){
+    public ApiResult<Boolean> del(@RequestBody List<Integer> ids){
         VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要删除的行");
         //检查下面是否有
         List<TBaseArea> delNodes = baseAreaService.getBaseMapper().selectByIds(ids);
         List<String> hasChildNodes=new ArrayList<>();
-        List<Long> childIds=new ArrayList<>();
+        List<Integer> childIds=new ArrayList<>();
         for ( TBaseArea delNode: delNodes) {
             childIds.clear();
             adminBaseAreaService.getAllChildIds( Convert.convert(TBaseAreaVO.class,delNode) ,childIds);
@@ -153,7 +153,7 @@ public class BaseAreaController extends ControllerBase {
     @PostMapping("enable")
     @MethodInfoMark(value = "启用" ,menuName = "区域管理")
     @ApiMark(moduleName = "区域管理", apiName = "启用")
-    public ApiResult<Boolean> enable(@RequestBody List<Long> ids){
+    public ApiResult<Boolean> enable(@RequestBody List<Integer> ids){
         VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要启用的行");
 
         baseAreaService.upState(1, ids, AdminUserUtil.getUserNo(), AdminUserUtil.getUserName());
@@ -169,10 +169,10 @@ public class BaseAreaController extends ControllerBase {
     @PostMapping("disable")
     @MethodInfoMark(value = "禁用" ,menuName = "区域管理")
     @ApiMark(moduleName = "区域管理", apiName = "禁用")
-    public ApiResult<Boolean> disable(@RequestBody List<Long> ids){
+    public ApiResult<Boolean> disable(@RequestBody List<Integer> ids){
         VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要禁用的行");
         List<TBaseArea> tBaseAreas = baseAreaService.getBaseMapper().selectByIds(ids);
-        List<Long> allIds=new ArrayList<>();
+        List<Integer> allIds=new ArrayList<>();
         allIds.addAll(ids);
         for (TBaseArea baseArea :tBaseAreas) {
             adminBaseAreaService.getAllChildIds(Convert.convert(TBaseAreaVO.class,baseArea) , allIds);
diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java
index 7967e40b..6bec033f 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/CustomerController.java
@@ -122,7 +122,7 @@ public class CustomerController extends ControllerBase {
     @PostMapping("del")
     @MethodInfoMark(value = "删除" ,menuName = "客户管理")
     @ApiMark(moduleName = "客户管理", apiName = "删除")
-    public ApiResult<Boolean> del(@RequestBody List<Long> ids){
+    public ApiResult<Boolean> del(@RequestBody List<Integer> ids){
         VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要删除的行");
 
         //
diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
index d06c5e95..246b22b3 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class BaseAreaEditDTO {
 
-    private Long id=0L;
+    private Integer id=0;
 
 
     private Long parentAreaRowId=0L;
diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java
index eb3e539c..ba76f539 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/CustomerDTO.java
@@ -14,7 +14,7 @@ public class CustomerDTO {
     /**
      * id
      */
-    private Long id;
+    private Integer id;
 
 
 
diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java
index 06015e41..672c4446 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java
@@ -34,7 +34,7 @@ public class AdminBaseAreaService {
             List<TBaseAreaVO> allAreaList = Convert.toList(TBaseAreaVO.class,baseAreaService.lambdaQuery()
                     .eq(TBaseArea::getDelIs,0)
                     .list()) ;
-            Map<Long, TBaseAreaVO> collect = allAreaList.stream().collect(Collectors.toMap(TBaseAreaVO::getId, Function.identity()));
+            Map<Integer, TBaseAreaVO> collect = allAreaList.stream().collect(Collectors.toMap(TBaseAreaVO::getId, Function.identity()));
             List<TBaseAreaVO> allParents=new ArrayList<>();
             for (TBaseAreaVO data:dataResult){
                 allParents.addAll(getAllParents(data, collect));
@@ -54,7 +54,7 @@ public class AdminBaseAreaService {
 
 
 
-    public List<Long> getAllChildIds(TBaseAreaVO node, List<Long> ids) {
+    public List<Integer> getAllChildIds(TBaseAreaVO node, List<Integer> ids) {
         List<TBaseAreaVO> immediateChildren = findChildDepartmentsByParentId(node.getId());
         ids.addAll(immediateChildren.stream().map(u->u.getId()).collect(Collectors.toSet()));
         for (TBaseAreaVO child : immediateChildren) {
@@ -74,13 +74,13 @@ public class AdminBaseAreaService {
         }
     }
 
-    private List<TBaseAreaVO> findChildDepartmentsByParentId(Long parentId) {
+    private List<TBaseAreaVO> findChildDepartmentsByParentId(Integer parentId) {
         List<TBaseArea> areas = baseAreaService.lambdaQuery().eq(TBaseArea::getParentAreaRowId, parentId).eq(TBaseArea::getDelIs,0).list();
         return Convert.toList(TBaseAreaVO.class,areas);
     }
 
 
-    private List<TBaseAreaVO> getAllParents(TBaseAreaVO node, Map<Long, TBaseAreaVO> idToNodeMap) {
+    private List<TBaseAreaVO> getAllParents(TBaseAreaVO node, Map<Integer, TBaseAreaVO> idToNodeMap) {
         List<TBaseAreaVO> parents = new ArrayList<>();
         Long parentId = node.getParentAreaRowId();
         while (parentId != null && parentId>0) {
@@ -100,7 +100,7 @@ public class AdminBaseAreaService {
      */
     private    List<TBaseAreaVO> buildTree(List<TBaseAreaVO> nodes) {
         // 使用Map存储id到Node的映射，便于快速查找父节点
-        Map<Long, TBaseAreaVO> idToNodeMap = nodes.stream()
+        Map<Integer, TBaseAreaVO> idToNodeMap = nodes.stream()
                 .collect(Collectors.toMap(TBaseAreaVO::getId,area->area, (existing, replacement) -> existing));
 
         List<TBaseAreaVO> roots = new ArrayList<>();
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaSimpleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaSimpleVO.java
index 610a3a16..06b98d37 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaSimpleVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaSimpleVO.java
@@ -10,7 +10,7 @@ import java.util.List;
 public class AreaSimpleVO {
 
     //区域id
-    private Long id;
+    private Integer id;
 
     //区域名称
     private String name;
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java
index 6fbb4932..48c7a481 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java
@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
 public class CompanySimpleVO {
 
     // 公司id
-    private Long id;
+    private Integer id;
 
     // 公司编码
     private String code;
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanyVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanyVO.java
index 3e5ad3d0..d25660fb 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanyVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanyVO.java
@@ -10,7 +10,7 @@ import java.util.List;
 public class CompanyVO {
 
     //公司id
-    private Long id;
+    private Integer id;
 
     //公司名称
     private String name;
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java
index 80f61f1d..716476cc 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java
@@ -26,7 +26,7 @@ public class TBaseAreaVO implements Serializable {
     /**
      * row_id
      */
-    private Long id;
+    private Integer id;
 
     /**
      * 区域编码
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
index c5ed4833..b2430465 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
@@ -29,7 +29,7 @@ public class TBaseArea implements Serializable {
      * id
      */
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     /**
      * 区域编码
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java
index 8da9d871..dc8eeb16 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java
@@ -3,12 +3,13 @@ package com.nflg.mobilebroken.repository.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 客户管理
@@ -29,7 +30,7 @@ public class TBaseCustomer implements Serializable {
      * id
      */
     @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     /**
      * 代理公司编码
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseAreaMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseAreaMapper.java
index 3f6d700e..a7361ff9 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseAreaMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseAreaMapper.java
@@ -23,7 +23,7 @@ public interface TBaseAreaMapper extends BaseMapper<TBaseArea> {
 
     void delByIds(@Param("ids")List<Long> ids ,@Param("userNo")String userNo , @Param("userName")String userName);
 
-    void upState(@Param("areaState") Integer areaState , @Param("ids")List<Long> ids ,@Param("userNo")String userNo , @Param("userName")String userName);
+    void upState(@Param("areaState") Integer areaState , @Param("ids")List<Integer> ids ,@Param("userNo")String userNo , @Param("userName")String userName);
 
     Integer getCount();
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseAreaService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseAreaService.java
index 8525da3d..f03f7869 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseAreaService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseAreaService.java
@@ -24,7 +24,7 @@ public interface ITBaseAreaService extends IService<TBaseArea> {
 
     void delByIds(@Param("ids") List<Long> ids, String userNo, String userName);
 
-    void upState(@Param("areaState") Integer areaState , @Param("ids")List<Long> ids ,@Param("userNo")String userNo , @Param("userName")String userName);
+    void upState(@Param("areaState") Integer areaState , @Param("ids")List<Integer> ids ,@Param("userNo")String userNo , @Param("userName")String userName);
 
 
     Integer getCount();
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
index aea8e094..14d03e1b 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
@@ -416,7 +416,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
     @Override
     public List<CompanyVO> searchSimpleUsers(SimpleUsersSearchRequest request) {
         List<CompanyVO> datas = new ArrayList<>();
-        Set<Long> companyIds = customerService.lambdaQuery()
+        Set<Integer> companyIds = customerService.lambdaQuery()
                 .select(TBaseCustomer::getId)
                 .eq(TBaseCustomer::getEnableState, 1)
                 .eq(TBaseCustomer::getDelIs, 0)
@@ -426,7 +426,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                 .map(TBaseCustomer::getId)
                 .collect(Collectors.toSet());
         if (StrUtil.isNotBlank(request.getName())) {
-            Set<Long> userCompanyIds = lambdaQuery()
+            Set<Integer> userCompanyIds = lambdaQuery()
                     .select(AppUser::getCompanyId)
                     .eq(AppUser::getState, UserState.Activated.getState())
                     .eq(AppUser::getIsPrimary, true)
@@ -435,7 +435,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                     .list()
                     .stream()
                     .flatMap(s -> Arrays.stream(s.getCompanyId().split(",")))
-                    .map(Long::parseLong)
+                    .map(Integer::parseInt)
                     .collect(Collectors.toSet());
             companyIds.addAll(userCompanyIds);
         }
@@ -494,7 +494,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         return getBaseMapper().selectOne(queryWrapper);
     }
 
-    private List<AppUserVO> getByCompanyId(Long companyId) {
+    private List<AppUserVO> getByCompanyId(Integer companyId) {
         return lambdaQuery()
                 .eq(AppUser::getCompanyId, companyId.toString())
                 .eq(AppUser::getState, UserState.Activated.getState())
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseAreaServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseAreaServiceImpl.java
index 5e0a1602..4f53340b 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseAreaServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseAreaServiceImpl.java
@@ -34,7 +34,7 @@ public class TBaseAreaServiceImpl extends ServiceImpl<TBaseAreaMapper, TBaseArea
         this.getBaseMapper().delByIds(ids,userNo,userName);
     }
 
-    public void upState(@Param("areaState") Integer areaState , @Param("ids")List<Long> ids ,@Param("userNo")String userNo , @Param("userName")String userName){
+    public void upState(@Param("areaState") Integer areaState , @Param("ids")List<Integer> ids ,@Param("userNo")String userNo , @Param("userName")String userName){
         this.getBaseMapper().upState(areaState, ids, userNo,userName);
     }