1.中台同步数据用户，组织进行关联

2.用户新增 级别，省市级
3.监审基础信息管理数据权限
4.监审项目管理数据权限

assistMg/src/main/java/com/hotent/baseInfo/model/CostCatalog.java

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @since 2025-09-19
  */
 @ApiModel(value="CostCatalog对象", description="成本监审目录表")
-public class CostCatalog extends BaseModel<CostCatalog> {
+public class    CostCatalog extends BaseModel<CostCatalog> {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")

assistMg/src/main/java/com/hotent/dataMiddlePlatform/manager/impl/DataMiddlePlatformManagerImpl.java

@@ -108,6 +108,7 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
                 List<UserVo> userVos = usersAll.stream().map(u -> {
                     UserVo userVo = new UserVo();
                     BeanUtils.copyProperties(u,userVo);
+                    userVo.setOrgId(u.getDeptId());
                     return userVo;
                 }).collect(Collectors.toList());
                 userService.addUsers(userVos);
@@ -123,13 +124,18 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
             List<com.hotent.uc.model.Role> roleList = new ArrayList<>();
             for (int i = 1; i==j ; i++) {
                 List<Role> roles = OAuth2ToMethod.getRolesAll(openApiToken, "1", "50");
+                List<String> codes = roles.stream().map(Role::getCode).collect(Collectors.toList());
+                List<com.hotent.uc.model.Role> ro=roleService.getRoles(codes);
                 for (Role role : roles) {
-                    com.hotent.uc.model.Role r = new com.hotent.uc.model.Role();
-                    r.setId(UniqueIdUtil.getSuid());
-                    r.setName(role.getName());
-                    r.setCode(role.getCode());
-                    r.setCreateTime(LocalDateTime.now());
-                    roleList.add(r);
+                    com.hotent.uc.model.Role ored = ro.stream().filter(rol -> rol.getCode().equals(role.getCode())).findAny().orElse(null);
+                    if (ored==null) {
+                        com.hotent.uc.model.Role r = new com.hotent.uc.model.Role();
+                        r.setId(UniqueIdUtil.getSuid());
+                        r.setName(role.getName());
+                        r.setCode(role.getCode());
+                        r.setCreateTime(LocalDateTime.now());
+                        roleList.add(r);
+                    }
                 }
                 if (usersAll.size()==50) {
                     j++;
@@ -182,6 +188,10 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
         //if (!(code.isPresent() && SsoConfig.MODE_JWT.equals(mode))) {
             handleSingleLogin(isMobile, MapUtil.getString(userAttrs, "tenantId"), account, token);
         //}
+        User byAccount = userService.getByAccount(userName);
+        if (byAccount!=null) {
+            userAttrs.put("dataScope",byAccount.getDataScope());
+        }
         // Return the token
         return ResponseEntity.ok(new JwtAuthenticationResponse(token, userName, account, userId, jwtConfig.getExpirationLong(), userAttrs));
 

assistMg/src/main/java/com/hotent/project/controller/CostAnnualPlanController.java

@@ -1,6 +1,7 @@
 package com.hotent.project.controller;
 
 
+import com.hotent.base.query.PageList;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.baseInfo.model.CostDocumentTemplate;
@@ -10,6 +11,7 @@ import com.hotent.project.req.CostAnnualPlanPageReq;
 import com.hotent.project.resp.CostAnnualPlanDetailResp;
 import com.hotent.resp.PageResp;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +41,8 @@ public class CostAnnualPlanController extends BaseController<CostAnnualPlanManag
 
 	// 创建通用服务实例
 	private final CrudService crudService = new CrudService();
+	@Autowired
+	private CostAnnualPlanManager costAnnualPlanManager;
 
 	/**
 	 * 根据id获取年度监审计划表数据详情
@@ -54,9 +58,15 @@ public class CostAnnualPlanController extends BaseController<CostAnnualPlanManag
 	}
 
 	//分页查询
-	@PostMapping(value="/pageList")
+	/*@PostMapping(value="/pageList")
 	@ApiOperation(value="分页查询pageList",httpMethod = "POST",notes = "分页查询pageList")
 	public PageResp<CostAnnualPlan> pageList(@RequestBody CostAnnualPlanPageReq req){
 		return  crudService.pageQuery(req, baseService::pageList);
+	}*/
+	@PostMapping(value="/pageList")
+	@ApiOperation(value="分页查询pageList",httpMethod = "POST",notes = "分页查询pageList")
+	public PageList<CostAnnualPlan> pageList(@RequestBody CostAnnualPlanPageReq req) throws Exception {
+		return  costAnnualPlanManager.pageList(req);
 	}
+
 }

assistMg/src/main/java/com/hotent/project/controller/CostProjectApprovalController.java

@@ -3,6 +3,7 @@ package com.hotent.project.controller;
 
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
+import com.hotent.base.query.PageList;
 import com.hotent.common.CrudService;
 import com.hotent.project.model.CostProjectSurvey;
 import com.hotent.project.req.CostProjectApprovalPageReq;
@@ -49,6 +50,9 @@ public class CostProjectApprovalController extends BaseController<CostProjectApp
 	UserManager userService;
 	// 创建通用服务实例
 	private final CrudService crudService = new CrudService();
+
+	@Autowired
+	private CostProjectApprovalManager costProjectApprovalManager;
 	/**
 	 * 根据id获取成本监审立项主表数据详情
 	 * @param id
@@ -62,12 +66,22 @@ public class CostProjectApprovalController extends BaseController<CostProjectApp
 		return CommonResult.<CostProjectApprovalDetailResp>ok().value(baseService.getDetail(id));
 	}
 	//分页查询
-	@PostMapping(value="/pageList")
+	/*@PostMapping(value="/pageList")
 	@ApiOperation(value="分页查询pageList",httpMethod = "POST",notes = "分页查询pageList")
 	public CommonResult<PageResp<CostProjectApproval>> pageList(@RequestBody CostProjectApprovalPageReq req) {
 		return CommonResult.<PageResp<CostProjectApproval>>ok().value(crudService.pageQuery(req, baseService::pageList));
+	}*/
+
+
+	@PostMapping(value="/pageList")
+	@ApiOperation(value="分页查询pageList",httpMethod = "POST",notes = "分页查询pageList")
+	public PageList<CostProjectApproval> pageList(@RequestBody CostProjectApprovalPageReq req) throws Exception {
+		return costProjectApprovalManager.pageList(req);
 	}
 
+
+
+
 	//任务发布
 	@PostMapping(value="/publish")
 	@ApiOperation(value="任务发布",httpMethod = "POST",notes = "任务发布")

assistMg/src/main/java/com/hotent/project/controller/CostProjectMemoController.java

@@ -3,6 +3,7 @@ package com.hotent.project.controller;
 
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
+import com.hotent.base.query.PageList;
 import com.hotent.common.CrudService;
 import com.hotent.project.model.CostProjectApproval;
 import com.hotent.project.req.CostProjectApprovalPageReq;
@@ -46,11 +47,17 @@ public class CostProjectMemoController extends BaseController<CostProjectMemoMan
     private final CrudService crudService = new CrudService();
 
 	//分页查询
-	@PostMapping(value="/pageList")
+	/*@PostMapping(value="/pageList")
 	@ApiOperation(value="备忘录列表")
 	public PageResp<CostProjectMemoQueryResp> pageList(@RequestBody CostProjectMemoQueryReq req) {
 		return crudService.pageQuery(req, costProjectMemoManager::pageList);
-	}
+	}*/
+
+        @PostMapping(value="/pageList")
+    @ApiOperation(value="备忘录列表")
+    public PageList<CostProjectMemo> pageList(@RequestBody CostProjectMemoQueryReq req) throws Exception {
+        return  costProjectMemoManager.pageList(req);
+    }
     /**
      * 根据id获取监审项目备忘录表数据详情
      * @param id

assistMg/src/main/java/com/hotent/project/dao/CostAnnualPlanDao.java

@@ -1,7 +1,9 @@
 package com.hotent.project.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.project.model.CostAnnualPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 年度监审计划表 Mapper 接口
@@ -12,4 +14,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CostAnnualPlanDao extends BaseMapper<CostAnnualPlan> {
 
+    Page<CostAnnualPlan> getCostAnnualPlanPage(Page<CostAnnualPlan> objectPage
+            , @Param("dataScope") Integer dataScope
+            , @Param("provinceCode") String provinceCode
+            , @Param("cityCode") String cityCode
+            , @Param("countyCode") String countyCode
+            , @Param("planYear") String planYear
+            , @Param("areaCode") String areaCode
+            , @Param("projectName") String projectName);
 }

assistMg/src/main/java/com/hotent/project/dao/CostProjectApprovalDao.java

@@ -1,7 +1,9 @@
 package com.hotent.project.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.project.model.CostProjectApproval;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 成本监审立项主表 Mapper 接口
@@ -12,4 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CostProjectApprovalDao extends BaseMapper<CostProjectApproval> {
 
+    Page<CostProjectApproval> getCostProjectApprovalPage(Page<CostProjectApproval> objectPage , @Param("dataScope") Integer dataScope
+            , @Param("provinceCode") String provinceCode
+            , @Param("cityCode") String cityCode
+            , @Param("countyCode") String countyCode
+            , @Param("projectYear") String projectYear
+            , @Param("areaCode") String areaCode
+            , @Param("projectName") String projectName);
 }

assistMg/src/main/java/com/hotent/project/dao/CostProjectMemoDao.java

@@ -1,7 +1,12 @@
 package com.hotent.project.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.project.model.CostProjectMemo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hotent.project.resp.CostProjectMemoQueryResp;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
 
 /**
  * 监审项目备忘录表 Mapper 接口
@@ -13,4 +18,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CostProjectMemoDao extends BaseMapper<CostProjectMemo> {
 
     void updateMemo(CostProjectMemo copy);
+
+    Page<CostProjectMemo> getCostProjectMemoPage(Page<CostProjectMemo> objectPage
+            , @Param("dataScope") Integer dataScope
+            , @Param("provinceCode") String provinceCode
+            , @Param("cityCode") String cityCode
+            , @Param("countyCode") String countyCode
+            , @Param("projectId") Integer projectId
+            , @Param("year") String year
+            , @Param("content") String content
+            , @Param("memoDate") LocalDate memoDate
+            , @Param("startTime") LocalDate startTime
+            , @Param("endTime") LocalDate endTime);
 }

assistMg/src/main/java/com/hotent/project/manager/CostAnnualPlanManager.java

@@ -1,6 +1,7 @@
 package com.hotent.project.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.query.PageList;
 import com.hotent.project.model.CostAnnualPlan;
 import com.hotent.base.manager.BaseManager;
 import com.hotent.project.req.CostAnnualPlanPageReq;
@@ -27,6 +28,6 @@ public interface CostAnnualPlanManager extends BaseManager<CostAnnualPlan> {
 	 */
 	void createOrUpdate(CostAnnualPlan costAnnualPlan);
 
-	IPage<CostAnnualPlan> pageList(CostAnnualPlanPageReq req);
+	PageList<CostAnnualPlan> pageList(CostAnnualPlanPageReq req) throws Exception;
 
 }

assistMg/src/main/java/com/hotent/project/manager/CostProjectApprovalManager.java

@@ -1,6 +1,7 @@
 package com.hotent.project.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.query.PageList;
 import com.hotent.enterpriseDeclare.req.CostAuditTaskPageReq;
 import com.hotent.project.model.CostProjectApproval;
 import com.hotent.base.manager.BaseManager;
@@ -32,7 +33,7 @@ public interface CostProjectApprovalManager extends BaseManager<CostProjectAppro
 	/**
 	 * 分页查询
 	 */
-	IPage<CostProjectApproval> pageList(CostProjectApprovalPageReq req);
+	PageList<CostProjectApproval> pageList(CostProjectApprovalPageReq req) throws Exception;
 
 
 	/**

assistMg/src/main/java/com/hotent/project/manager/CostProjectMemoManager.java

@@ -1,6 +1,7 @@
 package com.hotent.project.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.query.PageList;
 import com.hotent.project.model.CostProjectMemo;
 import com.hotent.base.manager.BaseManager;
 import com.hotent.project.req.CostProjectMemoQueryReq;
@@ -34,7 +35,7 @@ public interface CostProjectMemoManager extends BaseManager<CostProjectMemo> {
 	 * @param costProjectMemoQueryReq
 	 * @return
 	 */
-	IPage<CostProjectMemoQueryResp> pageList(CostProjectMemoQueryReq costProjectMemoQueryReq);
+	PageList<CostProjectMemo> pageList(CostProjectMemoQueryReq costProjectMemoQueryReq) throws Exception;
 
     public int updateMemo(CostProjectMemoUpdateReq req);
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostAnnualPlanManagerImpl.java

@@ -3,6 +3,7 @@ package com.hotent.project.manager.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.query.PageList;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.exception.BaseException;
 import com.hotent.base.util.StringUtil;
@@ -15,8 +16,12 @@ import com.hotent.project.manager.CostAnnualPlanManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.project.req.CostAnnualPlanPageReq;
 import com.hotent.project.resp.CostAnnualPlanDetailResp;
+import com.hotent.surveyinfo.model.CostSurveyFdTemplate;
+import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.api.service.IOrgService;
 import com.hotent.uc.manager.OrgManager;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.AreaCodeUtil;
 import com.hotent.util.CopyUtil;
@@ -47,6 +52,9 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 	private OrgManager orgManager;
 
 	@Autowired
+	private UserManager userService;
+
+	@Autowired
 	private AuditedUnitManager auditedUnitManager;
 
 	@Override
@@ -94,8 +102,8 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 	}
 
 	@Override
-	public IPage<CostAnnualPlan> pageList(CostAnnualPlanPageReq req){
-		LambdaQueryWrapper<CostAnnualPlan> qw = new LambdaQueryWrapper<>();
+	public PageList<CostAnnualPlan> pageList(CostAnnualPlanPageReq req) throws Exception {
+		/*LambdaQueryWrapper<CostAnnualPlan> qw = new LambdaQueryWrapper<>();
 		qw.eq(CostAnnualPlan::getIsDeleted, BaseConstant.NORMAL_STATUS);
 		if (StringUtil.isNotEmpty(req.getProjectName())) {
 			qw.like(CostAnnualPlan::getProjectName, req.getProjectName());
@@ -108,7 +116,24 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 		}
 
 		IPage<CostAnnualPlan> page = new Page<>(req.getPageNum(), req.getPageSize());
-		return this.page(page,qw);
+		return this.page(page,qw);*/
+
+		IUser iUser = ContextUtil.getCurrentUser();
+		User user = userService.getByAccount(iUser.getAccount());
+		req.setDataScope(user.getDataScope());
+		req.setProvinceCode(user.getProvinceCode());
+		req.setCityCode(user.getCityCode());
+		req.setCountyCode(user.getCountyCode());
+		Page<CostAnnualPlan> objectPage = new Page<>(req.getPage(),req.getPageSize());
+		//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+		Page<CostAnnualPlan> page =baseMapper.getCostAnnualPlanPage(objectPage
+				,req.getDataScope()
+				,req.getProvinceCode(),req.getCityCode()
+				,req.getCountyCode()
+				,req.getPlanYear()
+				,req.getAreaCode()
+				,req.getProjectName());
+		return new PageList<>(page);
 	}
 
 	//新增

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.exception.BaseException;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.manager.*;
 import com.hotent.baseInfo.model.*;
@@ -27,6 +28,7 @@ import com.hotent.surveyinfo.model.*;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.manager.OrgManager;
 import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.AreaCodeUtil;
 import com.hotent.util.CopyUtil;
@@ -196,6 +198,9 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     @Autowired
     private UserManager userManager;
 
+    @Autowired
+    UserManager userService;
+
     @Override
     public CostProjectApprovalDetailResp getDetail(String id) {
         CostProjectApproval costProjectApproval = this.get(id);
@@ -327,8 +332,8 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
 
 
     @Override
-    public IPage<CostProjectApproval> pageList(CostProjectApprovalPageReq req) {
-        LambdaQueryWrapper<CostProjectApproval> qw = new LambdaQueryWrapper<>();
+    public PageList<CostProjectApproval> pageList(CostProjectApprovalPageReq req) throws Exception {
+        /*LambdaQueryWrapper<CostProjectApproval> qw = new LambdaQueryWrapper<>();
         qw.eq(CostProjectApproval::getIsDeleted, BaseConstant.NORMAL_STATUS);
         if (StringUtil.isNotEmpty(req.getProjectName())) {
             qw.like(CostProjectApproval::getProjectName, req.getProjectName());
@@ -340,7 +345,24 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
             qw.eq(CostProjectApproval::getAreaCode, req.getAreaCode());
         }
         IPage<CostProjectApproval> page = new Page<>(req.getPageNum(), req.getPageSize());
-        return this.page(page, qw);
+        return this.page(page, qw);*/
+
+        IUser iUser = ContextUtil.getCurrentUser();
+        User user = userService.getByAccount(iUser.getAccount());
+        req.setDataScope(user.getDataScope());
+        req.setProvinceCode(user.getProvinceCode());
+        req.setCityCode(user.getCityCode());
+        req.setCountyCode(user.getCountyCode());
+        Page<CostProjectApproval> objectPage = new Page<>(req.getPage(),req.getPageSize());
+        //Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+        Page<CostProjectApproval> page =baseMapper.getCostProjectApprovalPage(objectPage
+                ,req.getDataScope()
+                ,req.getProvinceCode(),req.getCityCode()
+                ,req.getCountyCode()
+                ,req.getProjectYear()
+                ,req.getAreaCode()
+                ,req.getProjectName());
+        return new PageList<>(page);
     }
 
 

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectMemoManagerImpl.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dingtalk.open.app.stream.network.api.ServiceException;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.project.dao.CostProjectApprovalDao;
+import com.hotent.project.model.CostAnnualPlan;
 import com.hotent.project.model. CostProjectApproval;
 import com.hotent.project.model.CostProjectApproval;
 import com.hotent.project.model.CostProjectMemo;
@@ -18,6 +20,10 @@ import com.hotent.project.req.CostProjectMemoQueryReq;
 import com.hotent.project.req.CostProjectMemoUpdateReq;
 import com.hotent.project.resp.CostProjectMemoDetailResp;
 import com.hotent.project.resp.CostProjectMemoQueryResp;
+import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
+import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.CopyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +56,9 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 	@Resource
 	private CostProjectApprovalDao costProjectApprovalDao;
 
+	@Autowired
+	private UserManager userService;
+
 	@Override
 	public CostProjectMemoDetailResp getDetail(String id) {
 
@@ -73,13 +82,13 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 	}
 
 @Override
-	public IPage<CostProjectMemoQueryResp> pageList(CostProjectMemoQueryReq req) {
+	public PageList<CostProjectMemo> pageList(CostProjectMemoQueryReq req) throws Exception {
 		// 检查pageNum和pageSize是否合理
-		if (req.getPageNum() <= 0 || req.getPageSize() <= 0) {
+		/*if (req.getPageNum() <= 0 || req.getPageSize() <= 0) {
 			throw new IllegalArgumentException("pageNum和pageSize必须大于0");
-		}
+		}*/
 
-		LambdaQueryWrapper<CostProjectMemo> qw = new LambdaQueryWrapper<>();
+		/*LambdaQueryWrapper<CostProjectMemo> qw = new LambdaQueryWrapper<>();
 		if (req.getProjectId() != null) {
 			qw.eq(CostProjectMemo::getProjectId, req.getProjectId());
 		}
@@ -93,10 +102,10 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 		if(ObjectUtil.isNotEmpty(req.getYear())){
 			qw.like(CostProjectMemo::getCreateTime, req.getYear());
 		}
-		qw.orderByDesc(CostProjectMemo::getId);
+		qw.orderByDesc(CostProjectMemo::getId);*/
 		
 		// 使用MyBatis Plus分页查询
-		Page<CostProjectMemo> page = new Page<>(req.getPageNum(), req.getPageSize());
+		/*Page<CostProjectMemo> page = new Page<>(req.getPageNum(), req.getPageSize());
 		IPage<CostProjectMemo> costProjectMemoIPage = this.page(page, qw);
 
 		// 查询年度计划项目名称
@@ -137,9 +146,33 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 
 		// 构造返回的分页对象
 		Page<CostProjectMemoQueryResp> respPage = new Page<>(req.getPageNum(), req.getPageSize(), costProjectMemoIPage.getTotal());
-		respPage.setRecords(costProjectMemoQueryResps);
+		respPage.setRecords(costProjectMemoQueryResps);*/
 		
-		return respPage;
+		//return respPage;
+
+
+
+	IUser iUser = ContextUtil.getCurrentUser();
+	User user = userService.getByAccount(iUser.getAccount());
+	req.setDataScope(user.getDataScope());
+	req.setProvinceCode(user.getProvinceCode());
+	req.setCityCode(user.getCityCode());
+	req.setCountyCode(user.getCountyCode());
+	Page<CostProjectMemo> objectPage = new Page<>(req.getPage(),req.getPageSize());
+	//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+	Page<CostProjectMemo> page =baseMapper.getCostProjectMemoPage(objectPage
+			,req.getDataScope()
+			,req.getProvinceCode()
+			,req.getCityCode()
+			,req.getCountyCode()
+			,req.getProjectId()
+			,req.getYear()
+			,req.getContent()
+			,req.getMemoDate()
+			,req.getStartTime()
+			,req.getEndTime());
+
+	return new PageList<>(page);
 	}
 
 	@Override

assistMg/src/main/java/com/hotent/project/req/CostAnnualPlanPageReq.java

@@ -1,5 +1,6 @@
 package com.hotent.project.req;
 
+import com.hotent.base.query.PageBean;
 import com.hotent.req.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +11,7 @@ import lombok.Setter;
 @ApiModel("年度监审计划")
 @Getter
 @Setter
-public class CostAnnualPlanPageReq extends PageReq {
+public class CostAnnualPlanPageReq extends PageBean {
 
     @ApiModelProperty("年度")
     private String planYear;
@@ -22,6 +23,13 @@ public class CostAnnualPlanPageReq extends PageReq {
     @ApiModelProperty("监审项目名称")
     private String projectName;
 
-
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
 
 }

assistMg/src/main/java/com/hotent/project/req/CostProjectApprovalPageReq.java

@@ -1,5 +1,6 @@
 package com.hotent.project.req;
 
+import com.hotent.base.query.PageBean;
 import com.hotent.req.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,12 +10,19 @@ import lombok.Data;
 
 @ApiModel("成本监审立项分页查询请求参数")
 @Data
-public class CostProjectApprovalPageReq extends PageReq {
+public class CostProjectApprovalPageReq extends PageBean {
     @ApiModelProperty(value = "监审项目名称")
     private String projectName;
     @ApiModelProperty(value = "地区")
     private String areaCode;
     @ApiModelProperty(value = "年度")
     private String projectYear;
-
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
 }

assistMg/src/main/java/com/hotent/project/req/CostProjectMemoQueryReq.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.hotent.base.query.PageBean;
 import com.hotent.req.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +20,7 @@ import java.time.LocalDate;
 @ApiModel("备忘录列表请求参数")
 @Getter
 @Setter
-public class CostProjectMemoQueryReq extends PageReq {
+public class CostProjectMemoQueryReq extends PageBean {
 
 
     @ApiModelProperty(value = "关联的成本监审项目ID")
@@ -45,4 +46,14 @@ public class CostProjectMemoQueryReq extends PageReq {
     private LocalDate endTime;
 
 
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
+
+
 }

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyFdTemplateController.java

@@ -5,6 +5,7 @@ import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.controller.BaseController;
 import com.hotent.base.model.CommonResult;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.common.CrudService;
 import com.hotent.resp.PageResp;
@@ -14,6 +15,7 @@ import com.hotent.surveyinfo.manager.CostSurveyFdTemplateVersionManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateVersionManager;
 import com.hotent.surveyinfo.model.*;
+import com.hotent.surveyinfo.req.ConstSurveyFdPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyFdPageReq;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.uc.api.model.IUser;
@@ -73,6 +75,12 @@ public class CostSurveyFdTemplateController extends BaseController<CostSurveyFdT
 		return crudService.pageQuery(req, constbaseService::getCostSurveyList);
 	}
 
+	@PostMapping(value="/listPage")
+	@ApiOperation(value="获取登录人创建的所有财务数据表模板数据", httpMethod = "POST", notes = "获取所有财务数据表模板数据集合")
+	public PageList<CostSurveyFdTemplate> listPage(@RequestBody ConstSurveyFdPageParam param) throws Exception{
+		return constbaseService.listPage(param);
+	}
+
 	/**
 	 * 获取所有现行版启用的财务数据表模板数据
 	 * @return

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateController.java

@@ -3,6 +3,7 @@ package com.hotent.surveyinfo.controller;
 
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.PinyinUtil;
 import com.hotent.common.CrudService;
 import com.hotent.resp.PageResp;
@@ -11,7 +12,7 @@ import com.hotent.surveyinfo.dao.CostSurveyTemplateHeadersDao;
 import com.hotent.surveyinfo.dao.CostSurveyTemplateItemsDao;
 import com.hotent.surveyinfo.manager.*;
 import com.hotent.surveyinfo.model.*;
-import com.hotent.surveyinfo.model.dto.CostSurveyData;
+import com.hotent.surveyinfo.req.ConstSurveyPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.util.ContextUtil;
@@ -75,14 +76,15 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
 	// 创建通用服务实例
 	private final CrudService crudService = new CrudService();
 	/**
-	 * 获取当前登录人创建的所有成本调查表模板数据
+	 * 获取所有成本调查表模板数据
 	 * @return
 	 * @throws Exception
 	 */
-	@GetMapping(value="/listAll")
-	@ApiOperation(value="获取当前登录人创建的所有成本调查表模板数据", httpMethod = "GET", notes = "获取所有成本调查表模板数据集合")
-	public PageResp<CostSurveyTemplate> listAll(ConstSurveyPageReq req) throws Exception{
-		return crudService.pageQuery(req, constbaseService::getCostSurveyList);
+	@PostMapping(value="/listPage")
+	@ApiOperation(value="获取成本调查表模板数据", httpMethod = "POST", notes = "获取所有成本调查表模板数据集合")
+	public PageList<CostSurveyTemplate> listPage(
+			 @RequestBody ConstSurveyPageParam params) throws Exception{
+		return constbaseService.getCostSurveyListPage(params);
 	}
 
 	/**

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostVerifyTemplateController.java

@@ -5,6 +5,7 @@ import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.controller.BaseController;
 import com.hotent.base.model.CommonResult;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.common.CrudService;
 import com.hotent.resp.PageResp;
@@ -13,7 +14,9 @@ import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateVersionManager;
 import com.hotent.surveyinfo.manager.CostVerifyTemplateManager;
 import com.hotent.surveyinfo.model.*;
+import com.hotent.surveyinfo.req.ConstSurveyFdPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
+import com.hotent.surveyinfo.req.ConstVerifyPageParam;
 import com.hotent.surveyinfo.req.ConstVerifyPageReq;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.util.ContextUtil;
@@ -73,6 +76,12 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 		return crudService.pageQuery(req, constbaseService::getCostSurveyList);
 	}
 
+	@PostMapping(value="/listPage")
+	@ApiOperation(value="获取所有成本核定表模板数据", httpMethod = "POST", notes = "获取所有成本核定表模板数据")
+	public PageList<CostVerifyTemplate> listPage(@RequestBody ConstVerifyPageParam param) throws Exception{
+		return constbaseService.listPage(param);
+	}
+
 	/**
 	 * 获取所有状态为启用的成本核定表模板数据
 	 * @return 启用状态的成本核定表模板列表

assistMg/src/main/java/com/hotent/surveyinfo/dao/CostSurveyFdTemplateDao.java

@@ -1,6 +1,7 @@
 package com.hotent.surveyinfo.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.surveyinfo.model.CostSurveyFdTemplate;
 import com.hotent.surveyinfo.model.CostSurveyTemplate;
 import org.apache.ibatis.annotations.Param;
@@ -17,4 +18,14 @@ import java.util.List;
 public interface CostSurveyFdTemplateDao extends BaseMapper<CostSurveyFdTemplate> {
 
     List<CostSurveyFdTemplate> selectByCondition(@Param("costSurveyFdTemplate") CostSurveyFdTemplate costSurveyFdTemplate);
+
+    Page<CostSurveyFdTemplate> getCostSurveyFdTemplatePage(Page<CostSurveyFdTemplate> objectPage
+            , @Param("contentType") String contentType
+            , @Param("type") String type
+            , @Param("dataScope") Integer dataScope
+            , @Param("provinceCode") String provinceCode
+            , @Param("cityCode") String cityCode
+            , @Param("countyCode") String countyCode
+            , @Param("keyword") String keyword
+            , @Param("status") Integer status);
 }

assistMg/src/main/java/com/hotent/surveyinfo/dao/CostSurveyTemplateDao.java

@@ -1,7 +1,9 @@
 package com.hotent.surveyinfo.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.surveyinfo.model.CostSurveyTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hotent.surveyinfo.req.ConstSurveyPageParam;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -17,4 +19,16 @@ import java.util.List;
 public interface CostSurveyTemplateDao extends BaseMapper<CostSurveyTemplate> {
 
     List<CostSurveyTemplate> selectByCondition(@Param("costSurveyTemplate") CostSurveyTemplate costSurveyTemplate);
+
+    Page<CostSurveyTemplate> getCostSurveyTemplatePage(Page<CostSurveyTemplate> page, @Param("constSurveyPage") ConstSurveyPageParam constSurveyPage);
+
+    Page<CostSurveyTemplate> getCostSurveyTemplatePage1(Page<CostSurveyTemplate> page
+            , @Param("contentType") String contentType
+            , @Param("type") String type
+            , @Param("dataScope") Integer dataScope
+            , @Param("provinceCode") String provinceCode
+            , @Param("cityCode") String cityCode
+            , @Param("countyCode") String countyCode
+            , @Param("keyword") String keyword
+            , @Param("status") Integer status);
 }

assistMg/src/main/java/com/hotent/surveyinfo/dao/CostVerifyTemplateDao.java

@@ -1,6 +1,7 @@
 package com.hotent.surveyinfo.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.surveyinfo.model.CostSurveyTemplate;
 import com.hotent.surveyinfo.model.CostVerifyTemplate;
 import org.apache.ibatis.annotations.Param;
@@ -17,4 +18,13 @@ import java.util.List;
 public interface CostVerifyTemplateDao extends BaseMapper<CostVerifyTemplate> {
 
     List<CostVerifyTemplate> selectByCondition(@Param("costSurveyTemplate") CostVerifyTemplate costSurveyTemplate);
+
+    Page<CostVerifyTemplate> getConstVerifyPage(Page<CostVerifyTemplate> objectPage , @Param("contentType") String contentType
+            , @Param("type") String type
+            , @Param("dataScope") Integer dataScope
+            , @Param("provinceCode") String provinceCode
+            , @Param("cityCode") String cityCode
+            , @Param("countyCode") String countyCode
+            , @Param("keyword") String keyword
+            , @Param("status") Integer status);
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/CostSurveyFdTemplateManager.java

@@ -2,7 +2,9 @@ package com.hotent.surveyinfo.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hotent.base.manager.BaseManager;
+import com.hotent.base.query.PageList;
 import com.hotent.surveyinfo.model.*;
+import com.hotent.surveyinfo.req.ConstSurveyFdPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyFdPageReq;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 
@@ -46,4 +48,5 @@ public interface CostSurveyFdTemplateManager extends BaseManager<CostSurveyFdTem
 	List<CostSurveyFdTemplate> listByCatalogId(String catalogId);
 
 
+	PageList<CostSurveyFdTemplate> listPage(ConstSurveyFdPageParam param) throws Exception;
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/CostSurveyTemplateManager.java

@@ -1,14 +1,12 @@
 package com.hotent.surveyinfo.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hotent.baseInfo.model.CostCatalog;
-import com.hotent.baseInfo.req.CostCatalogPageReq;
+import com.hotent.base.query.PageList;
 import com.hotent.surveyinfo.model.CostSurveyTemplate;
 import com.hotent.base.manager.BaseManager;
 import com.hotent.surveyinfo.model.CostSurveyTemplateHeaders;
 import com.hotent.surveyinfo.model.CostSurveyTemplateItems;
-import com.hotent.surveyinfo.model.CostSurveyTemplateVersion;
-import com.hotent.surveyinfo.model.dto.CostSurveyData;
+import com.hotent.surveyinfo.req.ConstSurveyPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 
 import java.util.List;
@@ -49,4 +47,5 @@ public interface CostSurveyTemplateManager extends BaseManager<CostSurveyTemplat
 
 	List<CostSurveyTemplate> listByCatalogId(String catalogId);
 
+	PageList<CostSurveyTemplate> getCostSurveyListPage( ConstSurveyPageParam params) throws Exception;
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/CostVerifyTemplateManager.java

@@ -2,8 +2,10 @@ package com.hotent.surveyinfo.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hotent.base.manager.BaseManager;
+import com.hotent.base.query.PageList;
 import com.hotent.surveyinfo.model.*;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
+import com.hotent.surveyinfo.req.ConstVerifyPageParam;
 import com.hotent.surveyinfo.req.ConstVerifyPageReq;
 
 import java.util.List;
@@ -43,4 +45,5 @@ public interface CostVerifyTemplateManager extends BaseManager<CostVerifyTemplat
 	String generateVersionNumber();
 
 
+    PageList<CostVerifyTemplate> listPage(ConstVerifyPageParam param) throws Exception;
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyFdTemplateManagerImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.surveyinfo.dao.*;
 import com.hotent.surveyinfo.manager.CostSurveyFdTemplateItemsManager;
@@ -11,9 +12,12 @@ import com.hotent.surveyinfo.manager.CostSurveyFdTemplateManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateItemsManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.surveyinfo.model.*;
+import com.hotent.surveyinfo.req.ConstSurveyFdPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyFdPageReq;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -44,6 +48,8 @@ public class CostSurveyFdTemplateManagerImpl extends BaseManagerImpl<CostSurveyF
 	CostSurveyFdTemplateVersionDao costSurveyTemplateVersionMapper;
 	@Autowired
 	private DataSource dataSource;
+	@Autowired
+	private UserManager userService;
 	@Override
 	public IPage<CostSurveyFdTemplate> getCostSurveyList(ConstSurveyFdPageReq req) {
 		// 构建查询条件
@@ -153,5 +159,22 @@ public class CostSurveyFdTemplateManagerImpl extends BaseManagerImpl<CostSurveyF
 		return this.list(queryWrapper);
 	}
 
+	@Override
+	public PageList<CostSurveyFdTemplate> listPage(ConstSurveyFdPageParam param) throws Exception {
+		IUser iUser = ContextUtil.getCurrentUser();
+		User user = userService.getByAccount(iUser.getAccount());
+		param.setDataScope(user.getDataScope());
+		param.setProvinceCode(user.getProvinceCode());
+		param.setCityCode(user.getCityCode());
+		param.setCountyCode(user.getCountyCode());
+		Page<CostSurveyFdTemplate> objectPage = new Page<>(param.getPage(),param.getPageSize());
+		//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+		Page<CostSurveyFdTemplate> page =baseMapper.getCostSurveyFdTemplatePage(objectPage,param.getContentType()
+				,param.getType(),param.getDataScope()
+				,param.getProvinceCode(),param.getCityCode()
+				,param.getCountyCode(),param.getKeyword(),param.getStatus());
+		return new PageList<>(page);
+	}
+
 
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyTemplateManagerImpl.java

@@ -3,8 +3,9 @@ package com.hotent.surveyinfo.manager.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hotent.base.query.PageList;
+import com.hotent.base.query.QueryFilter;
 import com.hotent.base.util.StringUtil;
-import com.hotent.baseInfo.model.CostCatalog;
 import com.hotent.surveyinfo.dao.CostSurveyTemplateHeadersDao;
 import com.hotent.surveyinfo.dao.CostSurveyTemplateVersionDao;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateItemsManager;
@@ -14,25 +15,18 @@ import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.surveyinfo.model.CostSurveyTemplateHeaders;
 import com.hotent.surveyinfo.model.CostSurveyTemplateItems;
-import com.hotent.surveyinfo.model.CostSurveyTemplateVersion;
-import com.hotent.surveyinfo.model.dto.CostSurveyData;
-import com.hotent.surveyinfo.model.dto.CostSurveyField;
+import com.hotent.surveyinfo.req.ConstSurveyPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.time.LocalDateTime;
 import java.util.*;
-import javax.annotation.Resource;
-import com.hotent.base.util.BeanUtils;
 import javax.sql.DataSource;
 
 /**
@@ -55,9 +49,11 @@ public class CostSurveyTemplateManagerImpl extends BaseManagerImpl<CostSurveyTem
 	CostSurveyTemplateVersionDao costSurveyTemplateVersionMapper;
 	@Autowired
 	private DataSource dataSource;
-	@Override
-	public IPage<CostSurveyTemplate> getCostSurveyList(ConstSurveyPageReq req) {
-		// 构建查询条件
+	@Autowired
+	private UserManager userService;
+	//@Override
+	public IPage<CostSurveyTemplate> getCostSurveyList(QueryFilter queryFilter) {
+		/*// 构建查询条件
 		LambdaQueryWrapper<CostSurveyTemplate> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(CostSurveyTemplate::getIsDelete, "0")	;
 		IUser user = ContextUtil.getCurrentUser();
@@ -84,7 +80,15 @@ public class CostSurveyTemplateManagerImpl extends BaseManagerImpl<CostSurveyTem
 
 		// 创建分页对象
 		Page<CostSurveyTemplate> page = new Page<>(req.getPageNum(), req.getPageSize());
-		return this.page(page,queryWrapper);
+		return this.page(page,queryWrapper);*/
+
+		return null;
+	}
+
+	@Override
+	public IPage<CostSurveyTemplate> getCostSurveyList(ConstSurveyPageReq req) {
+
+		return null;
 	}
 
 	@Override
@@ -165,5 +169,22 @@ public class CostSurveyTemplateManagerImpl extends BaseManagerImpl<CostSurveyTem
 		// 根据查询条件过滤
 	}
 
+	@Override
+	public PageList<CostSurveyTemplate> getCostSurveyListPage( ConstSurveyPageParam params) throws Exception {
+		IUser iUser = ContextUtil.getCurrentUser();
+		User user = userService.getByAccount(iUser.getAccount());
+		params.setDataScope(user.getDataScope());
+		params.setProvinceCode(user.getProvinceCode());
+		params.setCityCode(user.getCityCode());
+		params.setCountyCode(user.getCountyCode());
+		Page<CostSurveyTemplate> objectPage = new Page<>(params.getPage(),params.getPageSize());
+		//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+		Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage1(objectPage,params.getContentType()
+				,params.getType(),params.getDataScope()
+				,params.getProvinceCode(),params.getCityCode()
+				,params.getCountyCode(),params.getKeyword(),params.getStatus());
+		return new PageList<>(page);
+	}
+
 
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostVerifyTemplateManagerImpl.java

@@ -5,18 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 
 import com.hotent.surveyinfo.dao.CostVerifyTemplateDao;
 import com.hotent.surveyinfo.dao.CostVerifyTemplateHeadersDao;
 import com.hotent.surveyinfo.manager.CostVerifyTemplateItemsManager;
 import com.hotent.surveyinfo.manager.CostVerifyTemplateManager;
-import com.hotent.surveyinfo.model.CostSurveyTemplateVersion;
-import com.hotent.surveyinfo.model.CostVerifyTemplate;
-import com.hotent.surveyinfo.model.CostVerifyTemplateHeaders;
-import com.hotent.surveyinfo.model.CostVerifyTemplateItems;
+import com.hotent.surveyinfo.model.*;
+import com.hotent.surveyinfo.req.ConstVerifyPageParam;
 import com.hotent.surveyinfo.req.ConstVerifyPageReq;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -47,6 +48,8 @@ public class CostVerifyTemplateManagerImpl extends BaseManagerImpl<CostVerifyTem
 //	CostSurveyTemplateVersionDao costSurveyTemplateVersionMapper;
 	@Autowired
 	private DataSource dataSource;
+	@Autowired
+	private UserManager userService;
 	@Override
 	public IPage<CostVerifyTemplate> getCostSurveyList(ConstVerifyPageReq req) {
 		// 构建查询条件
@@ -156,7 +159,22 @@ public class CostVerifyTemplateManagerImpl extends BaseManagerImpl<CostVerifyTem
 		return String.format("%s%04d", dateStr, sequence);
 	}
 
-
+	@Override
+	public PageList<CostVerifyTemplate> listPage(ConstVerifyPageParam param) throws Exception {
+		IUser iUser = ContextUtil.getCurrentUser();
+		User user = userService.getByAccount(iUser.getAccount());
+		param.setDataScope(user.getDataScope());
+		param.setProvinceCode(user.getProvinceCode());
+		param.setCityCode(user.getCityCode());
+		param.setCountyCode(user.getCountyCode());
+		Page<CostVerifyTemplate> objectPage = new Page<>(param.getPage(),param.getPageSize());
+		//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
+		Page<CostVerifyTemplate> page =baseMapper.getConstVerifyPage(objectPage,param.getContentType()
+				,param.getType(),param.getDataScope()
+				,param.getProvinceCode(),param.getCityCode()
+				,param.getCountyCode(),param.getKeyword(),param.getStatus());
+		return new PageList<>(page);
+	}
 
 
 }

assistMg/src/main/java/com/hotent/surveyinfo/req/ConstSurveyFdPageParam.java

@@ -0,0 +1,35 @@
+package com.hotent.surveyinfo.req;
+
+import com.hotent.base.query.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *@author: zhao yue yue
+ *@create: 2025-11-10 22:49
+ */
+@Setter
+@Getter
+public class ConstSurveyFdPageParam extends PageBean {
+
+    @ApiModelProperty(value = "监管类型", example = "1")
+    private String contentType;
+    @ApiModelProperty(value = "监审类型内容", example = "1,2,3")
+    private String type;
+    @ApiModelProperty(value = "监审id", example = "")
+    private String catalogId;
+    @ApiModelProperty(value = "财务模板内容关键词", example = "关键词")
+    private String keyword;
+    @ApiModelProperty(value = "状态（0-停用，1-启用）", example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
+}

assistMg/src/main/java/com/hotent/surveyinfo/req/ConstSurveyPageParam.java

@@ -0,0 +1,39 @@
+package com.hotent.surveyinfo.req;
+
+import com.hotent.base.query.PageBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *@author: zhao yue yue
+ *@create: 2025-11-10 15:40
+ */
+/*@EqualsAndHashCode(callSuper = true)
+@Data*/
+@Setter
+@Getter
+@ApiModel(value = "成本调查查询条件")
+public class ConstSurveyPageParam extends PageBean {
+
+    @ApiModelProperty(value = "监管类型", example = "1")
+    private String contentType;
+    @ApiModelProperty(value = "监审类型内容", example = "1,2,3")
+    private String type;
+    @ApiModelProperty(value = "监审id", example = "")
+    private String catalogId;
+    @ApiModelProperty(value = "监审内容关键词", example = "关键词")
+    private String keyword;
+    @ApiModelProperty(value = "状态（0-停用，1-启用）", example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
+
+}

assistMg/src/main/java/com/hotent/surveyinfo/req/ConstVerifyPageParam.java

@@ -0,0 +1,35 @@
+package com.hotent.surveyinfo.req;
+
+import com.hotent.base.query.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *@author: zhao yue yue
+ *@create: 2025-11-10 23:07
+ */
+@Getter
+@Setter
+public class ConstVerifyPageParam extends PageBean {
+
+    @ApiModelProperty(value = "监管类型", example = "1")
+    private String contentType;
+    @ApiModelProperty(value = "监审类型内容", example = "1,2,3")
+    private String type;
+    @ApiModelProperty(value = "监审id", example = "")
+    private String catalogId;
+    @ApiModelProperty(value = "模板内容关键词", example = "关键词")
+    private String keyword;
+    @ApiModelProperty(value = "状态（0-停用，1-启用）", example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "级别0：省，1：市，2：区（县）")
+    private Integer dataScope;
+    @ApiModelProperty(value = "所属省")
+    private String provinceCode;
+    @ApiModelProperty(value = "所属市")
+    private String cityCode;
+    @ApiModelProperty(value = "所属区、县")
+    private String countyCode;
+
+}

assistMg/src/main/resources/mapper/CostAnnualPlanMapper.xml

@@ -52,4 +52,38 @@
         where
         plan_id = ${planId}
     </select>
+
+    <select id="getCostAnnualPlanPage"
+            resultMap="BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        cost_annual_plan c,
+        uc_user u
+        WHERE
+        c.create_by=u.ACCOUNT_
+        <if test=" planYear != null and  planYear != ''">
+            and c.plan_year=#{planYear}
+        </if>
+        <if test=" areaCode != null and  areaCode != ''">
+            and c.area_code=#{areaCode}
+        </if>
+
+        <if test=" projectName != null and  projectName != ''">
+            and c.project_name LIKE CONCAT('%', #{projectName}, '%')
+        </if>
+
+        <if test=" dataScope != null and  dataScope != ''">
+            <if test=" dataScope ==1">
+                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+            </if>
+            <if test=" dataScope ==2">
+                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+            </if>
+        </if>
+        ORDER BY c.create_time
+    </select>
+
+
+
 </mapper>

assistMg/src/main/resources/mapper/CostProjectApprovalMapper.xml

@@ -65,4 +65,37 @@
 		where 
 		    project_id = ${projectId}
 	</select>
+
+
+
+    <select id="getCostProjectApprovalPage"
+            resultMap="BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        cost_annual_plan c,
+        uc_user u
+        WHERE
+        c.create_by=u.ACCOUNT_
+        <if test=" projectYear != null and  projectYear != ''">
+            and c.project_year=#{projectYear}
+        </if>
+        <if test=" areaCode != null and  areaCode != ''">
+            and c.area_code=#{areaCode}
+        </if>
+
+        <if test=" projectName != null and  projectName != ''">
+            and c.project_name LIKE CONCAT('%', #{projectName}, '%')
+        </if>
+
+        <if test=" dataScope != null and  dataScope != ''">
+            <if test=" dataScope ==1">
+                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+            </if>
+            <if test=" dataScope ==2">
+                and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+            </if>
+        </if>
+        ORDER BY c.create_time
+    </select>
 </mapper>

assistMg/src/main/resources/mapper/CostProjectMemoMapper.xml

@@ -78,4 +78,50 @@
 		where 
 		    id = ${id}
 	</select>
+
+
+	<select id="getCostProjectMemoPage" resultMap="BaseResultMap">
+		SELECT
+			cpm.id,
+			cpm.project_id,
+			cpa.project_name,
+			cpm.memo_date,
+			cpm.title,
+			cpm.content,
+			cpm.reminder_type
+		FROM
+			cost_project_memo cpm,
+			cost_project_approval cpa,
+			uc_user uc
+		WHERE
+			cpm.project_id = cpa.project_id
+		    AND uc.ACCOUNT_ = cpm.create_by
+		  <if test=" projectId != null and projectId != '' ">
+			  AND cpm.project_id=#{projectId}
+		  </if>
+
+		<if test=" content != null and content != '' ">
+			AND cpm.content LIKE CONCAT('%', #{content}, '%')
+		</if>
+
+		<if test=" year != null and year != '' ">
+			AND cpm.year LIKE CONCAT('%', #{year}, '%')
+		</if>
+
+		<if test="startTime != null and endTime != null
+                    and startTime != '' and endTime != ''">
+			AND #{param.startTime} &lt;= DATE_FORMAT(cpm.create_time, '%Y-%m-%d')
+			AND #{param.endTime} &gt;= DATE_FORMAT(cpm.create_time, '%Y-%m-%d')
+		</if>
+
+		<if test=" dataScope != null and  dataScope != ''">
+			<if test=" dataScope ==1">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+			</if>
+			<if test=" dataScope ==2">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+			</if>
+		</if>
+	</select>
+
 </mapper>

assistMg/src/main/resources/mapper/CostSurveyFdTemplateMapper.xml

@@ -83,6 +83,8 @@
 		cost_survey_fd_template
 		${ew.customSqlSegment}
 	</select>
+
+
 	
 	<select id="selectById" resultMap="BaseResultMap">
 		select 
@@ -92,4 +94,41 @@
 		where 
 		    survey_template_id = #{surveyTemplateId}
 	</select>
+
+
+
+	<select id="getCostSurveyFdTemplatePage"
+			resultMap="BaseResultMap">
+		SELECT
+		c.*
+		FROM
+		cost_survey_fd_template c,
+		uc_user u
+		WHERE
+		c.create_by=u.ACCOUNT_
+		<if test=" contentType != null and  contentType != ''">
+			and c.content_type=#{ contentType}
+		</if>
+		<if test=" type != null and  type != ''">
+			and c.type=#{ type}
+		</if>
+
+		<if test=" keyword != null and  keyword != ''">
+			and c.survey_template_name LIKE CONCAT('%', #{ keyword}, '%')
+		</if>
+		<if test=" status != null and  status != ''">
+			and c.status=#{ status}
+		</if>
+		<if test=" dataScope != null and  dataScope != ''">
+			<if test=" dataScope ==1">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+			</if>
+			<if test=" dataScope ==2">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+			</if>
+		</if>
+		ORDER BY c.create_time
+	</select>
+
+
 </mapper>

assistMg/src/main/resources/mapper/CostSurveyTemplateMapper.xml

@@ -19,7 +19,6 @@
     <result column="type" property="type" />
     <result column="remarks" property="remarks" />
 	<result column="is_delete" property="isDelete" />
-
 	<result column="area_code" property="areaCode" />
 	<result column="area_level" property="areaLevel" />
     </resultMap>
@@ -92,4 +91,39 @@
 		where 
 		    survey_template_id = #{surveyTemplateId}
 	</select>
+
+	<select id="getCostSurveyTemplatePage1"
+			resultMap="BaseResultMap">
+		SELECT
+			c.*
+		FROM
+			cost_survey_template c,
+			uc_user u
+		WHERE
+			c.create_by=u.ACCOUNT_
+		<if test=" contentType != null and  contentType != ''">
+			and c.content_type=#{ contentType}
+		</if>
+		<if test=" type != null and  type != ''">
+			and c.type=#{ type}
+		</if>
+
+		<if test=" keyword != null and  keyword != ''">
+			and c.survey_template_name LIKE CONCAT('%', #{ keyword}, '%')
+		</if>
+		<if test=" status != null and  status != ''">
+			and c.status=#{ status}
+		</if>
+		<if test=" dataScope != null and  dataScope != ''">
+			<if test=" dataScope ==1">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+			</if>
+			<if test=" dataScope ==2">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+			</if>
+		</if>
+		ORDER BY c.create_time
+	</select>
+
+
 </mapper>

assistMg/src/main/resources/mapper/CostVerifyTemplateMapper.xml

@@ -94,4 +94,40 @@
 		where 
 		    survey_template_id = #{surveyTemplateId}
 	</select>
+
+
+	<select id="getConstVerifyPage"
+			resultMap="BaseResultMap">
+		SELECT
+		c.*
+		FROM
+		cost_verify_template c,
+		uc_user u
+		WHERE
+		c.create_by=u.ACCOUNT_
+		<if test=" contentType != null and  contentType != ''">
+			and c.content_type=#{ contentType}
+		</if>
+		<if test=" type != null and  type != ''">
+			and c.type=#{ type}
+		</if>
+
+		<if test=" keyword != null and  keyword != ''">
+			and c.survey_template_name LIKE CONCAT('%', #{ keyword}, '%')
+		</if>
+		<if test=" status != null and  status != ''">
+			and c.status=#{ status}
+		</if>
+		<if test=" dataScope != null and  dataScope != ''">
+			<if test=" dataScope ==1">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode}
+			</if>
+			<if test=" dataScope ==2">
+				and u.PROVINCE_CODE=#{ provinceCode} and u.CITY_CODE=#{ cityCode} and u.COUNTY_CODE=#{ countyCode}
+			</if>
+		</if>
+		ORDER BY c.create_time
+	</select>
+
+
 </mapper>

auth-server/src/main/java/com/hotent/auth/server/controller/AuthenticationRestController.java

@@ -41,8 +41,9 @@ public class AuthenticationRestController {
 
     @RequestMapping(value = "/auth", method = RequestMethod.POST, produces = {"application/json; charset=utf-8"})
     @ApiOperation(value = "登录系统", httpMethod = "POST", notes = "登录系统")
-    public ResponseEntity<?> createAuthenticationToken(@RequestBody JwtAuthenticationRequest authenticationRequest) throws AuthenticationException, CertificateException {
-        return authenticationService.createAuthenticationToken(authenticationRequest);
+    public ResponseEntity<?> createAuthenticationToken(@RequestBody JwtAuthenticationRequest authenticationRequest) throws Exception {
+        ResponseEntity<JwtAuthenticationResponse> authenticationToken = authenticationService.createAuthenticationToken(authenticationRequest);
+        return authenticationToken;
     }
 
     @RequestMapping(value = "/sso/auth", method = RequestMethod.GET, produces = {"application/json; charset=utf-8"})

auth-server/src/main/java/com/hotent/auth/server/service/AuthenticationService.java

@@ -34,7 +34,7 @@ public interface AuthenticationService {
      * @param authenticationRequest
      * @return
      */
-    ResponseEntity<JwtAuthenticationResponse> createAuthenticationToken(JwtAuthenticationRequest authenticationRequest);
+    ResponseEntity<JwtAuthenticationResponse> createAuthenticationToken(JwtAuthenticationRequest authenticationRequest) throws Exception;
 
     ResponseEntity<?> createCustomToken(JwtCustomAuthenticationRequest authenticationRequest);
 

auth-server/src/main/java/com/hotent/auth/server/service/impl/AuthenticationServiceImpl.java

@@ -33,12 +33,15 @@ import com.hotent.base.util.RSAUtil;
 import com.hotent.base.util.StringUtil;
 import com.hotent.base.util.XmlUtil;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import io.jsonwebtoken.Claims;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -85,6 +88,8 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     BpmRuntimeFeignService bpmRuntimeFeignService;
     @Resource
     LoginLogService loginLogService;
+    @Autowired
+    private UserManager userService;
     @Resource
     SaaSConfig saasConfig;
     @Resource
@@ -107,7 +112,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     }
 
     @Override
-    public ResponseEntity<JwtAuthenticationResponse> createAuthenticationToken(JwtAuthenticationRequest authenticationRequest) {
+    public ResponseEntity<JwtAuthenticationResponse> createAuthenticationToken(JwtAuthenticationRequest authenticationRequest) throws Exception {
         String reqAccount = authenticationRequest.getUsername();
         String reqPassword = "";
 
@@ -163,6 +168,10 @@ public class AuthenticationServiceImpl implements AuthenticationService {
                 userAttrs.put("isHiddenDem", isHiddenDem);
             }
         }
+        User byAccount = userService.getByAccount(account);
+        if (byAccount!=null) {
+            userAttrs.put("dataScope",byAccount.getDataScope());
+        }
         //处理单用户登录
         Map<String,Object> userMap=handleSingleLogin(isMobile, MapUtil.getString(userAttrs, "tenantId"), account, token);
         userAttrs.put("isMoreLogin",userMap);

base/src/main/java/com/hotent/base/conf/JacksonObjectMapperConfig.java

@@ -28,7 +28,7 @@ public class JacksonObjectMapperConfig {
 	@Bean(name = "mapperObject")
 	public ObjectMapper getObjectMapper() {
 	    ObjectMapper om = new ObjectMapper();
-	    om.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	    om.setSerializationInclusion(JsonInclude.Include.ALWAYS);
         // 设置 SerializationFeature.FAIL_ON_EMPTY_BEANS 为 false
 	    om.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 	   // 忽略未知属性

uc/src/main/java/com/hotent/uc/controller/UserController.java

@@ -318,7 +318,8 @@ public class UserController extends BaseController<UserManager, User> {
 	@RequestMapping(value="user/getByAccount",method=RequestMethod.POST, produces = { "application/json; charset=utf-8" })
 	@ApiOperation(value = "根据用户账号获取用户信息", httpMethod = "POST", notes = "根据用户账号获取用户信息")
 	public User getByAccount(@ApiParam(name="account",value="用户账号") @RequestParam(required=true) Optional<String> account) throws Exception{
-		return userService.getByAccount(account.orElse(ContextUtil.getCurrentUser().getAccount()));
+		User serviceByAccount = userService.getByAccount(account.orElse(ContextUtil.getCurrentUser().getAccount()));
+		return serviceByAccount;
 	}
 
 	@RequestMapping(value="user/getUserByAccounts",method=RequestMethod.GET, produces = { "application/json; charset=utf-8" })

uc/src/main/java/com/hotent/uc/manager/RoleManager.java

@@ -208,4 +208,11 @@ public interface RoleManager extends BaseManager<Role>{
 	 * 获取该组织下的角色
 	 */
 	PageList<Role> queryRoleByExtOrgPath(QueryFilter queryFilter, String path);
+
+	/**
+	 * 根据code查询角色集合
+	 * @param codes
+	 * @return
+	 */
+	List<Role> getRoles(List<String> codes);
 }

uc/src/main/java/com/hotent/uc/manager/impl/RoleManagerImpl.java

@@ -177,6 +177,13 @@ public class RoleManagerImpl extends BaseManagerImpl <RoleDao, Role> implements
 		return new PageList<Role>(result);
 	}
 
+	@Override
+	public List<Role> getRoles(List<String> codes) {
+		QueryWrapper<Role> wrapper = new QueryWrapper<>();
+		wrapper.in("CODE_",codes);
+		return this.list(wrapper);
+	}
+
 	@CacheEvict(value = CacheKeyConst.EIP_SYS_USERMENU, key = "#userId")
     protected void removeUserMenuCacheByUserIde(String userId) {}
 

uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java

@@ -377,6 +377,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 						status = 1;
 					}
 					newUser.setStatus(status);
+					newUser.setCreateOrgId(user.getOrgId());
 					//try {
 					this.create(newUser);
 					//将用户加入一般用户角色中
@@ -469,9 +470,13 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		u.setStatus(user.getStatus());
 		u.setIdCard(user.getIdCard());
 		u.setPhone(user.getPhone());
+		u.setDataScope(user.getDataScope());
 		u.setPhoto(user.getPhoto());
 		u.setEducation(user.getEducation());
 		u.setLeaveDate(user.getLeaveDate());
+		u.setProvinceCode(user.getProvinceCode());
+		u.setCityCode(user.getCityCode());
+		u.setCountyCode(user.getCountyCode());
 		this.update(u);
 		CacheEvictUtil.deleteUserDetailsCache(u.getAccount());
 //        if(User.HASSYNCTOWX_YEX == u.getHasSyncToWx() && (0 == u.getStatus() || -2 == u.getStatus())) {

uc/src/main/java/com/hotent/uc/model/User.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.hotent.base.constants.SystemConstants;
@@ -179,7 +180,29 @@ public class User extends UcBaseModel<User>  implements IUser {
 	*/
 	@TableField("ID_CARD_")
 	@ApiModelProperty(name="idCard",notes="身份证号")
-	protected String idCard; 
+	protected String idCard;
+
+
+	 /**
+	  * 人员（数据）级别0：省，1：市，2：区（县）
+	  */
+	 @TableField("DATA_SCOPE")
+	 @ApiModelProperty(name="dataScope",notes="人员（数据）级别0：省，1：市，2：区（县）")
+	 private Integer dataScope;
+
+	 @ApiModelProperty(value = "所属省")
+	 @TableField("PROVINCE_CODE")
+	 private String provinceCode;
+
+	 @ApiModelProperty(value = "所属市")
+	 @TableField("CITY_CODE")
+	 private String cityCode;
+
+	 @ApiModelProperty(value = "所属区、县")
+	 @TableField("COUNTY_CODE")
+	 private String countyCode;
+
+
 	/**
 	* 办公电话
 	*/
@@ -297,6 +320,58 @@ public class User extends UcBaseModel<User>  implements IUser {
 	public String getId() {
 		return this.id;
 	}
+
+
+	 public void setDataScope(Integer dataScope) {
+		 this.dataScope = dataScope;
+	 }
+
+	 /**
+	  * 返回 dataScope
+	  * @return
+	  */
+	 public Integer getDataScope() {
+		 return this.dataScope;
+	 }
+
+
+	 public void setProvinceCode(String provinceCode) {
+		 this.provinceCode = provinceCode;
+	 }
+
+	 /**
+	  * 返回 dataScope
+	  * @return
+	  */
+	 public String getProvinceCode() {
+		 return this.provinceCode;
+	 }
+
+
+	 public void setCityCode(String cityCode) {
+		 this.cityCode = cityCode;
+	 }
+
+	 /**
+	  * 返回 dataScope
+	  * @return
+	  */
+	 public String getCityCode() {
+		 return this.cityCode;
+	 }
+
+
+	 public void setCountyCode(String countyCode) {
+		 this.countyCode = countyCode;
+	 }
+
+	 /**
+	  * 返回 dataScope
+	  * @return
+	  */
+	 public String getCountyCode() {
+		 return this.countyCode;
+	 }
 	
 	public void setFullname(String fullname) {
 		this.fullname = fullname;
@@ -554,6 +629,10 @@ public class User extends UcBaseModel<User>  implements IUser {
 		.append("education", this.education) 
 		.append("isDelete",this.isDelete)
 		.append("version",this.version)
+		.append("dataScope",this.dataScope)
+		.append("provinceCode",this.provinceCode)
+		.append("cityCode",this.cityCode)
+		.append("countyCode",this.countyCode)
 		.toString();
 	}
 

uc/src/main/java/com/hotent/uc/params/user/UserVo.java

@@ -101,6 +101,9 @@ public class UserVo implements UpdateCompare {
 	@ApiModelProperty(name = "from", notes = "来源")
 	private String from;
 
+	@ApiModelProperty(name = "dataScope", notes = "人员（数据）级别0：省，1：市，2：区（县）")
+	protected Integer dataScope;
+
 	@ApiModelProperty(name = "params", notes = "用户参数（获取单个用户时才会有值）")
 	private Map<String, Object> params;
 	
@@ -121,6 +124,17 @@ public class UserVo implements UpdateCompare {
 
 	@ApiModelProperty(name="orgId",notes="所属组织id")
 	protected String orgId;
+
+
+	@ApiModelProperty(value = "所属省")
+	private String provinceCode;
+
+	@ApiModelProperty(value = "所属市")
+	private String cityCode;
+
+	@ApiModelProperty(value = "所属区、县")
+	private String countyCode;
+
 	
 	public UserVo(User user) {
 		this.id = user.getId();
@@ -150,6 +164,10 @@ public class UserVo implements UpdateCompare {
 		this.clientToken=user.getClientToken();
 		this.phoneBrand= user.getPhoneBrand();
 		this.phoneRegId=user.getPhoneRegId();
+		this.dataScope=user.getDataScope();
+		this.provinceCode=user.getProvinceCode();
+		this.cityCode=user.getCityCode();
+		this.countyCode=user.getCountyCode();
 	}
 
 	public String getId() {
@@ -177,6 +195,10 @@ public class UserVo implements UpdateCompare {
 		user.setStatus(userVo.getStatus());
 		user.setIdCard(userVo.getIdCard());
 		user.setPhone(userVo.getPhone());
+		user.setDataScope(userVo.getDataScope());
+		user.setProvinceCode(userVo.getProvinceCode());
+		user.setCityCode(userVo.getCityCode());
+		user.setCountyCode(userVo.getCountyCode());
 		user.setBirthday(StringUtil.isNotEmpty(userVo.getBirthday())
 				? DateFormatUtil.parse(userVo.getBirthday(), StringPool.DATE_FORMAT_DATE).toLocalDate() : null);
 		user.setEntryDate(StringUtil.isNotEmpty(userVo.getEntryDate())
@@ -187,6 +209,14 @@ public class UserVo implements UpdateCompare {
 		return user;
 	}
 
+	public Integer getDataScope() {
+		return dataScope;
+	}
+
+	public void setDataScope(Integer dataScope) {
+		this.dataScope = dataScope;
+	}
+
 	public String getAccount() {
 		return account;
 	}
@@ -195,6 +225,31 @@ public class UserVo implements UpdateCompare {
 		this.account = account;
 	}
 
+	public String getProvinceCode() {
+		return provinceCode;
+	}
+
+	public void setProvinceCode(String provinceCode) {
+		this.provinceCode = provinceCode;
+	}
+
+
+	public String getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(String cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getCountyCode() {
+		return countyCode;
+	}
+
+	public void setCountyCode(String countyCode) {
+		this.countyCode = countyCode;
+	}
+
 	public String getFullname() {
 		return fullname;
 	}
@@ -463,6 +518,7 @@ public class UserVo implements UpdateCompare {
 		newVo.setUpdateTime(oldVo.getUpdateTime());
 		newVo.setUserNumber(oldVo.getUserNumber());
 		newVo.setTenantId(oldVo.getTenantId());
+		newVo.setDataScope(oldVo.getDataScope());
 		return newVo;
 	}
 }

uc/src/main/resources/mapper/UserMapper.xml

@@ -44,7 +44,7 @@
 		NOTIFY_TYPE_,USER_NUMBER_,ID_CARD_,PHONE_,
 		BIRTHDAY_,ENTRY_DATE_,LEAVE_DATE_,EDUCATION_,UPDATE_TIME_,IS_DELE_,VERSION_,WEIXIN_,PWD_CREATE_TIME_,tenant_id_,
 		create_by_,update_by_,
-		CLIENT_ID_,CLIENT_TOKEN_
+		CLIENT_ID_,CLIENT_TOKEN_,DATA_SCOPE,PROVINCE_CODE,CITY_CODE,COUNTY_CODE
 	</sql>
 
 	<select id="getByAccount"   parameterType="java.lang.String" resultMap="BaseResultMap">