diff --git a/antis-ncc-admin/src/views/lqMdMdgs/index.vue b/antis-ncc-admin/src/views/lqMdMdgs/index.vue
index 3731123..fdb5b43 100644
--- a/antis-ncc-admin/src/views/lqMdMdgs/index.vue
+++ b/antis-ncc-admin/src/views/lqMdMdgs/index.vue
@@ -1,228 +1,643 @@
 <template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
+			<!-- 搜索区域 -->
 			<el-row class="NCC-common-search-box" :gutter="16">
 				<el-form @submit.native.prevent>
-					<el-col :span="6">
+					<el-col :span="5">
 						<el-form-item label="门店编码">
-							<el-input v-model="query.id" placeholder="门店编码" clearable />	
+							<el-input 
+								v-model="query.mdbm" 
+								placeholder="请输入门店编码" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="单据门店编号">
-							<el-input v-model="query.djmdbh" placeholder="单据门店编号" clearable />	
+					<el-col :span="5">
+						<el-form-item label="门店名称">
+							<el-input 
+								v-model="query.dm" 
+								placeholder="请输入门店名称" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
+					<el-col :span="5">
 						<el-form-item label="单据门店">
-							<el-input v-model="query.djmd" placeholder="单据门店" clearable />	
-						</el-form-item>
-					</el-col>
-					<template v-if="showAll">
-					<el-col :span="6">
-						<el-form-item label="事业部">
-							<el-select v-model="query.syb" placeholder="事业部" clearable >
-								<el-option v-for="(item, index) in sybOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="教育部">
-							<el-select v-model="query.jyb" placeholder="教育部" clearable >
-								<el-option v-for="(item, index) in jybOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="科技部">
-							<el-select v-model="query.kjb" placeholder="科技部" clearable >
-								<el-option v-for="(item, index) in kjbOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="大项目部">
-							<el-select v-model="query.dxmb" placeholder="大项目部" clearable >
-								<el-option v-for="(item, index) in dxmbOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="归属起始时间">
-							<el-date-picker v-model="query.gsqssj" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="归属终止时间">
-							<el-date-picker v-model="query.gszzsj" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
+							<el-input 
+								v-model="query.djmd" 
+								placeholder="请输入单据门店" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="修改信息">
-							<el-input v-model="query.xgxx" placeholder="修改信息" />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="门店名称">
-							<el-select v-model="query.mdmc" placeholder="门店名称" clearable >
-								<el-option v-for="(item, index) in mdmcOptions" :key="index" :label="item.fullName" :value="item.id"  />
+					<el-col :span="5">
+						<el-form-item label="新店状态">
+							<el-select 
+								v-model="query.isNewStore" 
+								placeholder="请选择新店状态" 
+								clearable 
+								style="width: 100%; border-radius: 6px;"
+							>
+								<el-option label="新店" :value="true" />
+								<el-option label="老店" :value="false" />
 							</el-select>
 						</el-form-item>
 					</el-col>
-					</template>
-					<el-col :span="6">
+					<el-col :span="4">
 						<el-form-item>
-							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+							<div class="search-buttons" style="height: 32px;">
+								<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+								<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							</div>
 						</el-form-item>
 					</el-col>
 				</el-form>
 			</el-row>
 			<div class="NCC-common-layout-main NCC-flex-main">
 				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					<div class="NCC-common-head-left">
+						<h3 class="NCC-common-head-title">
+							<i class="el-icon-office-building"></i>
+							门店归属管理
+						</h3>
+						<span class="NCC-common-head-subtitle">共 {{ total }} 条记录</span>
 					</div>
 					<div class="NCC-common-head-right">
+						<el-button 
+							type="success" 
+							icon="el-icon-edit" 
+							:disabled="multipleSelection.length === 0"
+							@click="batchEditHandle"
+						>
+							批量编辑 ({{ multipleSelection.length }})
+						</el-button>
+						<el-button 
+							type="warning" 
+							icon="el-icon-download" 
+							@click="exportData"
+						>
+							导出数据
+						</el-button>
 						<el-tooltip effect="dark" content="刷新" placement="top">
 							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
 						</el-tooltip>
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="门店编码" align="left" />
-					<el-table-column prop="djmdbh" label="单据门店编号" align="left" />
-					<el-table-column prop="djmd" label="单据门店" align="left" />
-					<el-table-column label="事业部" prop="syb" align="left">
-							<template slot-scope="scope">{{ scope.row.syb | dynamicText(sybOptions) }}</template>
+                <NCC-table 
+					v-loading="listLoading" 
+					:data="list"
+					@selection-change="handleSelectionChange"
+					:row-key="row => row.id"
+				>
+					<el-table-column type="selection" width="55" align="center" />
+					<el-table-column prop="mdbm" label="门店编码" align="left" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<el-tag size="small" type="primary">{{ scope.row.mdbm }}</el-tag>
+						</template>
 					</el-table-column>
-					<el-table-column label="教育部" prop="jyb" align="left">
-							<template slot-scope="scope">{{ scope.row.jyb | dynamicText(jybOptions) }}</template>
+					<el-table-column prop="dm" label="门店名称" align="left" min-width="150" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="store-name">{{ scope.row.dm }}</span>
+						</template>
 					</el-table-column>
-					<el-table-column label="科技部" prop="kjb" align="left">
-							<template slot-scope="scope">{{ scope.row.kjb | dynamicText(kjbOptions) }}</template>
+					<el-table-column prop="djmd" label="单据门店" align="left" width="150" show-overflow-tooltip />
+					<el-table-column label="事业部" prop="syb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.syb" size="small" type="success">
+								{{ getDepartmentName(scope.row.syb, sybOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="教育部" prop="jyb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.jyb" size="small" type="warning">
+								{{ getDepartmentName(scope.row.jyb, jybOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
 					</el-table-column>
-					<el-table-column label="大项目部" prop="dxmb" align="left">
-							<template slot-scope="scope">{{ scope.row.dxmb | dynamicText(dxmbOptions) }}</template>
+					<el-table-column label="科技部" prop="kjb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.kjb" size="small" type="info">
+								{{ getDepartmentName(scope.row.kjb, kjbOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
 					</el-table-column>
-					<el-table-column prop="gsqssj" label="归属起始时间" align="left" />
-					<el-table-column prop="gszzsj" label="归属终止时间" align="left" />
-					<el-table-column prop="xgxx" label="修改信息" align="left" />
-					<el-table-column label="门店名称" prop="mdmc" align="left">
-							<template slot-scope="scope">{{ scope.row.mdmc | dynamicText(mdmcOptions) }}</template>
+					<el-table-column label="大项目部" prop="dxmb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.dxmb" size="small" type="danger">
+								{{ getDepartmentName(scope.row.dxmb, dxmbOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+					<el-table-column label="新店状态" align="center" width="100">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.isNewStore" type="success" size="small">
+								<i class="el-icon-star-on"></i> 新店
+							</el-tag>
+							<el-tag v-else type="info" size="small">
+								<i class="el-icon-star-off"></i> 老店
+							</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="120" align="center">
+						<template slot-scope="scope">
+							<el-button 
+								type="text" 
+								icon="el-icon-edit" 
+								@click="editHandle(scope.row)"
+								class="action-btn"
+							>
+								编辑
+							</el-button>
+							<el-button 
+								type="text" 
+								icon="el-icon-view" 
+								@click="viewHandle(scope.row)"
+								class="action-btn"
+							>
+								查看
+							</el-button>
 						</template>
 					</el-table-column>
 				</NCC-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
             </div>
         </div>
-		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+		<!-- 编辑弹窗 -->
+		<el-dialog 
+			:title="dialogTitle" 
+			:visible.sync="dialogVisible" 
+			width="700px" 
+			:close-on-click-modal="false"
+			:before-close="handleClose"
+			class="store-dialog"
+		>
+			<div class="dialog-header">
+				<div class="store-info">
+					<i class="el-icon-office-building"></i>
+					<span class="store-name">{{ editForm.dm }}</span>
+					<el-tag size="small" type="primary">{{ editForm.mdbm }}</el-tag>
+				</div>
+			</div>
+			<el-form :model="editForm" :rules="editRules" ref="editForm" label-width="120px" class="edit-form">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="事业部" prop="syb">
+							<el-select 
+								v-model="editForm.syb" 
+								placeholder="请选择事业部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in sybOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="教育部" prop="jyb">
+							<el-select 
+								v-model="editForm.jyb" 
+								placeholder="请选择教育部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in jybOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="科技部" prop="kjb">
+							<el-select 
+								v-model="editForm.kjb" 
+								placeholder="请选择科技部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in kjbOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="大项目部" prop="dxmb">
+							<el-select 
+								v-model="editForm.dxmb" 
+								placeholder="请选择大项目部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in dxmbOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="handleClose" :disabled="saveLoading">取消</el-button>
+				<el-button type="primary" @click="saveEdit" :loading="saveLoading">
+					<i class="el-icon-check"></i> 保存
+				</el-button>
+			</div>
+		</el-dialog>
+
+		<!-- 批量编辑弹窗 -->
+		<el-dialog 
+			title="批量编辑门店归属" 
+			:visible.sync="batchDialogVisible" 
+			width="600px" 
+			:close-on-click-modal="false"
+		>
+			<div class="batch-edit-header">
+				<i class="el-icon-warning"></i>
+				<span>已选择 {{ multipleSelection.length }} 个门店进行批量编辑</span>
+			</div>
+			<el-form :model="batchForm" :rules="batchRules" ref="batchForm" label-width="120px">
+				<el-form-item label="事业部" prop="syb">
+					<el-select v-model="batchForm.syb" placeholder="请选择事业部" clearable style="width: 100%;">
+						<el-option v-for="item in sybOptions" :key="item.Id" :label="item.FullName" :value="item.Id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="教育部" prop="jyb">
+					<el-select v-model="batchForm.jyb" placeholder="请选择教育部" clearable style="width: 100%;">
+						<el-option v-for="item in jybOptions" :key="item.Id" :label="item.FullName" :value="item.Id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="科技部" prop="kjb">
+					<el-select v-model="batchForm.kjb" placeholder="请选择科技部" clearable style="width: 100%;">
+						<el-option v-for="item in kjbOptions" :key="item.Id" :label="item.FullName" :value="item.Id" />
+					</el-select>
+				</el-form-item>
+				<el-form-item label="大项目部" prop="dxmb">
+					<el-select v-model="batchForm.dxmb" placeholder="请选择大项目部" clearable style="width: 100%;">
+						<el-option v-for="item in dxmbOptions" :key="item.Id" :label="item.FullName" :value="item.Id" />
+					</el-select>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="batchDialogVisible = false">取消</el-button>
+				<el-button type="primary" @click="saveBatchEdit" :loading="batchSaveLoading">
+					<i class="el-icon-check"></i> 批量保存
+				</el-button>
+			</div>
+		</el-dialog>
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 	</div>
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
     import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
 	export default {
-        components: { NCCForm, ExportBox },
+        components: { ExportBox },
         data() {
             return {
-                showAll: false,
 				query: {
-                    id:undefined,
-                    djmdbh:undefined,
-                    djmd:undefined,
-                    syb:undefined,
-                    jyb:undefined,
-                    kjb:undefined,
-                    dxmb:undefined,
-                    gsqssj:undefined,
-                    gszzsj:undefined,
-                    xgxx:undefined,
-                    mdmc:undefined,
+                    mdbm: undefined,
+                    dm: undefined,
+                    djmd: undefined,
+                    isNewStore: undefined
 				},
                 list: [],
                 listLoading: true,
-                multipleSelection: [], total: 0,
+                total: 0,
                 listQuery: {
                     currentPage: 1,
                     pageSize: 20,
 					sort: "desc",
                     sidx: "",
                 },
-                formVisible: false,
                 exportBoxVisible: false,
+                dialogVisible: false,
+                batchDialogVisible: false,
+                saveLoading: false,
+                batchSaveLoading: false,
+                multipleSelection: [],
+                dialogTitle: '编辑门店归属',
+                editForm: {
+                    id: '',
+                    mdbm: '',
+                    dm: '',
+                    syb: '',
+                    jyb: '',
+                    kjb: '',
+                    dxmb: ''
+                },
+                batchForm: {
+                    syb: '',
+                    jyb: '',
+                    kjb: '',
+                    dxmb: ''
+                },
+                editRules: {
+                    syb: [{ required: false, message: '请选择事业部', trigger: 'change' }],
+                    jyb: [{ required: false, message: '请选择教育部', trigger: 'change' }],
+                    kjb: [{ required: false, message: '请选择科技部', trigger: 'change' }],
+                    dxmb: [{ required: false, message: '请选择大项目部', trigger: 'change' }]
+                },
+                batchRules: {
+                    syb: [{ required: false, message: '请选择事业部', trigger: 'change' }],
+                    jyb: [{ required: false, message: '请选择教育部', trigger: 'change' }],
+                    kjb: [{ required: false, message: '请选择科技部', trigger: 'change' }],
+                    dxmb: [{ required: false, message: '请选择大项目部', trigger: 'change' }]
+                },
                 columnList: [
-                    { prop: 'id', label: '门店编码' },
-                    { prop: 'djmdbh', label: '单据门店编号' },
+                    { prop: 'mdbm', label: '门店编码' },
+                    { prop: 'dm', label: '门店名称' },
                     { prop: 'djmd', label: '单据门店' },
                     { prop: 'syb', label: '事业部' },
                     { prop: 'jyb', label: '教育部' },
                     { prop: 'kjb', label: '科技部' },
                     { prop: 'dxmb', label: '大项目部' },
-                    { prop: 'gsqssj', label: '归属起始时间' },
-                    { prop: 'gszzsj', label: '归属终止时间' },
-                    { prop: 'xgxx', label: '修改信息' },
-                    { prop: 'mdmc', label: '门店名称' },
+                    { prop: 'isNewStore', label: '是否新店' }
 				],
-				mdmcOptions : [],
-				sybOptions : [],
-				jybOptions : [],
-				kjbOptions : [],
-				dxmbOptions : [],
+				sybOptions: [],
+				jybOptions: [],
+				kjbOptions: [],
+				dxmbOptions: [],
 			}
         },
 		computed: {},
 		created() {
 			this.initData()
-			this.getmdmcOptions();
-			this.getsybOptions();
-			this.getjybOptions();
-			this.getkjbOptions();
-			this.getdxmbOptions();
+			this.loadDepartmentOptions()
 		},
 		methods: {
-			getmdmcOptions(){
-				previewDataInterface('730960205902251269').then(res => {
-					this.mdmcOptions = res.data
-				});
+			// 加载部门选项
+			loadDepartmentOptions() {
+				// 加载事业部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '事业部' }
+				}).then(res => {
+					this.sybOptions = res.data || []
+				}).catch(() => {
+					this.sybOptions = []
+				})
+
+				// 加载教育部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '教育部' }
+				}).then(res => {
+					this.jybOptions = res.data || []
+				}).catch(() => {
+					this.jybOptions = []
+				})
+
+				// 加载科技部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '科技部' }
+				}).then(res => {
+					this.kjbOptions = res.data || []
+				}).catch(() => {
+					this.kjbOptions = []
+				})
+
+				// 加载大项目部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '大项目部' }
+				}).then(res => {
+					this.dxmbOptions = res.data || []
+				}).catch(() => {
+					this.dxmbOptions = []
+				})
 			},
-			getsybOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.sybOptions = res.data
-				});
+
+			// 获取部门名称
+			getDepartmentName(id, options) {
+				const option = options.find(item => item.Id === id)
+				return option ? option.FullName : '未知'
 			},
-			getjybOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.jybOptions = res.data
-				});
+
+			// 加载所有门店的新店保护状态
+			async loadNewStoreStatus() {
+				if (!this.list || this.list.length === 0) return
+				
+				// 并行查询所有门店的保护状态
+				const promises = this.list.map(async (row) => {
+					if (!row.id) {
+						this.$set(row, 'isNewStore', false)
+						return
+					}
+					
+					try {
+						const res = await request({
+							url: `/api/Extend/LqMdXdbhsj/GetByStoreId/${row.id}`,
+							method: 'GET'
+						})
+						
+						this.$set(row, 'isNewStore', res.data && res.data.hasProtection === true)
+						
+					} catch (error) {
+						console.error(`查询门店 ${row.dm} 保护时间失败:`, error)
+						this.$set(row, 'isNewStore', false)
+					}
+				})
+				
+				await Promise.all(promises)
 			},
-			getkjbOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.kjbOptions = res.data
-				});
+
+			// 判断是否为新店（通过门店新店保护时间表查询）
+			async isNewStore(row) {
+				if (!row.id) return false
+				
+				try {
+					const res = await request({
+						url: `/api/Extend/LqMdXdbhsj/GetByStoreId/${row.id}`,
+						method: 'GET'
+					})
+					
+					const isNew = res.data && res.data.hasProtection === true
+					this.$set(row, 'isNewStore', isNew)
+					return isNew
+				} catch (error) {
+					console.error(`查询门店 ${row.dm} 保护时间失败:`, error)
+					this.$set(row, 'isNewStore', false)
+					return false
+				}
 			},
-			getdxmbOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.dxmbOptions = res.data
-				});
+
+			// 编辑处理
+			editHandle(row) {
+				this.dialogTitle = '编辑门店归属'
+				this.editForm = {
+					id: row.id,
+					mdbm: row.mdbm,
+					dm: row.dm,
+					syb: row.syb || '',
+					jyb: row.jyb || '',
+					kjb: row.kjb || '',
+					dxmb: row.dxmb || ''
+				}
+				this.dialogVisible = true
 			},
-			initData() {
+
+			// 查看处理
+			viewHandle(row) {
+				this.dialogTitle = '查看门店归属'
+				this.editForm = {
+					id: row.id,
+					mdbm: row.mdbm,
+					dm: row.dm,
+					syb: row.syb || '',
+					jyb: row.jyb || '',
+					kjb: row.kjb || '',
+					dxmb: row.dxmb || ''
+				}
+				this.dialogVisible = true
+			},
+
+			// 批量编辑处理
+			batchEditHandle() {
+				if (this.multipleSelection.length === 0) {
+					this.$message.warning('请先选择要编辑的门店')
+					return
+				}
+				this.batchForm = {
+					syb: '',
+					jyb: '',
+					kjb: '',
+					dxmb: ''
+				}
+				this.batchDialogVisible = true
+			},
+
+			// 多选处理
+			handleSelectionChange(val) {
+				this.multipleSelection = val
+			},
+
+			// 弹窗关闭处理
+			handleClose() {
+				if (this.saveLoading) {
+					this.$message.warning('正在保存中，请稍候...')
+					return
+				}
+				this.dialogVisible = false
+				this.$refs.editForm && this.$refs.editForm.resetFields()
+			},
+
+			// 保存编辑
+			saveEdit() {
+				this.$refs.editForm.validate((valid) => {
+					if (valid) {
+						this.saveLoading = true
+						request({
+							url: `/api/Extend/LqMdxx/${this.editForm.id}`,
+							method: 'PUT',
+							data: {
+								syb: this.editForm.syb,
+								jyb: this.editForm.jyb,
+								kjb: this.editForm.kjb,
+								dxmb: this.editForm.dxmb
+							}
+						}).then(res => {
+							this.$message.success('保存成功')
+							this.dialogVisible = false
+							this.initData()
+						}).catch(() => {
+							this.$message.error('保存失败')
+						}).finally(() => {
+							this.saveLoading = false
+						})
+					}
+				})
+			},
+
+			// 批量保存编辑
+			saveBatchEdit() {
+				this.$refs.batchForm.validate((valid) => {
+					if (valid) {
+						this.batchSaveLoading = true
+						const updateData = this.multipleSelection.map(item => ({
+							id: item.id,
+							syb: this.batchForm.syb,
+							jyb: this.batchForm.jyb,
+							kjb: this.batchForm.kjb,
+							dxmb: this.batchForm.dxmb
+						}))
+						
+						// 批量更新
+						Promise.all(updateData.map(data => 
+							request({
+								url: `/api/Extend/LqMdxx/${data.id}`,
+								method: 'PUT',
+								data: {
+									syb: data.syb,
+									jyb: data.jyb,
+									kjb: data.kjb,
+									dxmb: data.dxmb
+								}
+							})
+						)).then(() => {
+							this.$message.success(`成功更新 ${updateData.length} 个门店的归属信息`)
+							this.batchDialogVisible = false
+							this.multipleSelection = []
+							this.initData()
+						}).catch(() => {
+							this.$message.error('批量更新失败')
+						}).finally(() => {
+							this.batchSaveLoading = false
+						})
+					}
+				})
+			},
+
+			async initData() {
                 this.listLoading = true;
                 let _query = {
                     ...this.listQuery,
@@ -236,83 +651,31 @@
                         query[key] = _query[key]
                     }
                 }
-                request({
-                    url: `/api/Extend/LqMdMdgs`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
+                
+                try {
+                    const res = await request({
+                        url: `/api/Extend/LqMdxx`,
+                        method: 'GET',
+                        data: query
+                    })
+                    
                     this.list = res.data.list
                     this.total = res.data.pagination.total
+                    
+                    // 为每个门店查询新店保护状态
+                    await this.loadNewStoreStatus()
+                    
+                } catch (error) {
+                    console.error('加载门店数据失败:', error)
+                } finally {
                     this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqMdMdgs/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
                 }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqMdMdgs/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
             },
+
             download(data) {
                 let query = { ...data, ...this.listQuery, ...this.query }
                 request({
-                    url: `/api/Extend/LqMdMdgs/Actions/Export`,
+                    url: `/api/Extend/LqMdxx/Actions/Export`,
                     method: 'GET',
                     data: query
                 }).then(res => {
@@ -331,10 +694,6 @@
                 }
                 this.initData()
             },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
             reset() {
                 for (let key in this.query) {
                     this.query[key] = undefined
@@ -348,5 +707,149 @@
                 this.initData()
             }
 		}
-    }
-</script>
\ No newline at end of file
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 页面头部样式
+	.NCC-common-head-left {
+		display: flex;
+		align-items: center;
+		gap: 12px;
+	}
+
+	.NCC-common-head-title {
+		margin: 0;
+		font-size: 18px;
+		font-weight: 600;
+		color: #303133;
+		display: flex;
+		align-items: center;
+		gap: 8px;
+
+		i {
+			color: #409EFF;
+			font-size: 20px;
+		}
+	}
+
+	.NCC-common-head-subtitle {
+		color: #909399;
+		font-size: 14px;
+	}
+
+	// 表格样式
+	.store-name {
+		font-weight: 500;
+		color: #303133;
+	}
+
+	.empty-text {
+		color: #C0C4CC;
+		font-style: italic;
+	}
+
+	.action-btn {
+		padding: 4px 8px;
+		margin: 0 2px;
+		
+		&:hover {
+			background-color: #f5f7fa;
+		}
+	}
+
+	// 弹窗样式
+	.store-dialog {
+		.dialog-header {
+			padding: 16px 0;
+			border-bottom: 1px solid #EBEEF5;
+			margin-bottom: 20px;
+
+			.store-info {
+				display: flex;
+				align-items: center;
+				gap: 12px;
+
+				i {
+					font-size: 20px;
+					color: #409EFF;
+				}
+
+				.store-name {
+					font-size: 16px;
+					font-weight: 600;
+					color: #303133;
+				}
+			}
+		}
+
+		.edit-form {
+			.el-form-item {
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+	// 批量编辑样式
+	.batch-edit-header {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+		padding: 12px 16px;
+		background-color: #fdf6ec;
+		border: 1px solid #f5dab1;
+		border-radius: 4px;
+		margin-bottom: 20px;
+
+		i {
+			color: #e6a23c;
+			font-size: 16px;
+		}
+
+		span {
+			color: #e6a23c;
+			font-weight: 500;
+		}
+	}
+
+	// 搜索区域样式
+	.search-buttons {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+	}
+
+	// 响应式设计
+	@media (max-width: 768px) {
+		.NCC-common-head {
+			flex-direction: column;
+			align-items: flex-start;
+			gap: 12px;
+
+			.NCC-common-head-right {
+				width: 100%;
+				justify-content: flex-start;
+			}
+		}
+
+		.el-col {
+			margin-bottom: 16px;
+		}
+
+		.store-dialog {
+			.el-dialog {
+				width: 95% !important;
+				margin: 0 auto;
+			}
+		}
+	}
+
+	// 表格响应式
+	@media (max-width: 1200px) {
+		.NCC-table {
+			.el-table {
+				font-size: 12px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsInfoOutput.cs
deleted file mode 100644
index 0237076..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsInfoOutput.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
-{
-    /// <summary>
-    /// 门店归属输出参数
-    /// </summary>
-    public class LqMdMdgsInfoOutput
-    {
-        /// <summary>
-        /// 门店编码
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店编号
-        /// </summary>
-        public string djmdbh { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        public string djmd { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 教育部
-        /// </summary>
-        public string jyb { get; set; }
-        
-        /// <summary>
-        /// 科技部
-        /// </summary>
-        public string kjb { get; set; }
-        
-        /// <summary>
-        /// 大项目部
-        /// </summary>
-        public string dxmb { get; set; }
-        
-        /// <summary>
-        /// 归属起始时间
-        /// </summary>
-        public DateTime? gsqssj { get; set; }
-        
-        /// <summary>
-        /// 归属终止时间
-        /// </summary>
-        public DateTime? gszzsj { get; set; }
-        
-        /// <summary>
-        /// 修改信息
-        /// </summary>
-        public string xgxx { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsListOutput.cs
deleted file mode 100644
index 0e2b192..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsListOutput.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
-{
-    /// <summary>
-    /// 门店归属输入参数
-    /// </summary>
-    public class LqMdMdgsListOutput
-    {
-        /// <summary>
-        /// 门店编码
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店编号
-        /// </summary>
-        public string djmdbh { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        public string djmd { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 教育部
-        /// </summary>
-        public string jyb { get; set; }
-        
-        /// <summary>
-        /// 科技部
-        /// </summary>
-        public string kjb { get; set; }
-        
-        /// <summary>
-        /// 大项目部
-        /// </summary>
-        public string dxmb { get; set; }
-        
-        /// <summary>
-        /// 归属起始时间
-        /// </summary>
-        public DateTime? gsqssj { get; set; }
-        
-        /// <summary>
-        /// 归属终止时间
-        /// </summary>
-        public DateTime? gszzsj { get; set; }
-        
-        /// <summary>
-        /// 修改信息
-        /// </summary>
-        public string xgxx { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsUpInput.cs
deleted file mode 100644
index 738dd62..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
-{
-    /// <summary>
-    /// 门店归属更新输入参数
-    /// </summary>
-    public class LqMdMdgsUpInput : LqMdMdgsCrInput
-    {
-        /// <summary>
-        /// 门店编码
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
index 3cd1b17..5cbfb07 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
@@ -83,5 +83,40 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public string ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        public string jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        public string kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        public string dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        public DateTime? gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        public DateTime? gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
index 91755bb..b33da10 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
@@ -83,5 +83,40 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public string ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        public string jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        public string kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        public string dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        public DateTime? gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        public DateTime? gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
index cec8bb3..d747328 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
@@ -82,5 +82,40 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public string ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        public string jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        public string kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        public string dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        public DateTime? gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        public DateTime? gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListOutput.cs
index 9c0e998..6733be8 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListOutput.cs
@@ -1,78 +1,75 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
+using System;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.Organize
 {
     /// <summary>
-    /// 门店归属列表查询输入
+    /// 组织架构列表输出
     /// </summary>
-    public class LqMdMdgsListQueryInput : PageInputBase
+    public class OrganizeListOutput
     {
         /// <summary>
-        /// 选择导出数据key
+        /// 主键
         /// </summary>
-        public string selectKey { get; set; }
+        public string Id { get; set; }
 
         /// <summary>
-        /// 
+        /// 组织名称
         /// </summary>
-        public int dataType { get; set; }
-
+        public string FullName { get; set; }
 
         /// <summary>
-        /// 门店编码
+        /// 组织编码
         /// </summary>
-        public string id { get; set; }
-        
+        public string EnCode { get; set; }
+
         /// <summary>
-        /// 单据门店编号
+        /// 组织分类【company-公司、department-部门】
         /// </summary>
-        public string djmdbh { get; set; }
-        
+        public string Category { get; set; }
+
         /// <summary>
-        /// 单据门店
+        /// 父级组织ID
         /// </summary>
-        public string djmd { get; set; }
-        
+        public string ParentId { get; set; }
+
         /// <summary>
-        /// 门店名称
+        /// 父级组织名称
         /// </summary>
-        public string mdmc { get; set; }
-        
+        public string ParentName { get; set; }
+
         /// <summary>
-        /// 事业部
+        /// 组织主管ID
         /// </summary>
-        public string syb { get; set; }
-        
+        public string ManagerId { get; set; }
+
         /// <summary>
-        /// 教育部
+        /// 组织主管姓名
         /// </summary>
-        public string jyb { get; set; }
-        
+        public string ManagerName { get; set; }
+
         /// <summary>
-        /// 科技部
+        /// 描述
         /// </summary>
-        public string kjb { get; set; }
-        
+        public string Description { get; set; }
+
         /// <summary>
-        /// 大项目部
+        /// 排序码
         /// </summary>
-        public string dxmb { get; set; }
-        
+        public long? SortCode { get; set; }
+
         /// <summary>
-        /// 归属起始时间
+        /// 是否启用
         /// </summary>
-        public string gsqssj { get; set; }
-        
+        public int? EnabledMark { get; set; }
+
         /// <summary>
-        /// 归属终止时间
+        /// 创建时间
         /// </summary>
-        public string gszzsj { get; set; }
-        
+        public DateTime? CreatorTime { get; set; }
+
         /// <summary>
-        /// 修改信息
+        /// 子组织数量
         /// </summary>
-        public string xgxx { get; set; }
-        
+        public int ChildrenCount { get; set; }
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListQueryInput.cs
new file mode 100644
index 0000000..655dd00
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListQueryInput.cs
@@ -0,0 +1,35 @@
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.Organize
+{
+    /// <summary>
+    /// 组织架构查询输入参数
+    /// </summary>
+    public class OrganizeListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 组织名称（模糊查询）
+        /// </summary>
+        public string FullName { get; set; }
+
+        /// <summary>
+        /// 组织编码
+        /// </summary>
+        public string EnCode { get; set; }
+
+        /// <summary>
+        /// 组织分类【company-公司、department-部门】
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 父级组织ID
+        /// </summary>
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int? EnabledMark { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeTreeOutput.cs
index cfd726a..ee8716b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgs/LqMdMdgsCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeTreeOutput.cs
@@ -1,67 +1,60 @@
-using System;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.Organize
 {
     /// <summary>
-    /// 门店归属修改输入参数
+    /// 组织架构树形输出
     /// </summary>
-    public class LqMdMdgsCrInput
+    public class OrganizeTreeOutput
     {
         /// <summary>
-        /// 门店编码
+        /// 主键
         /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店编号
-        /// </summary>
-        public string djmdbh { get; set; }
-        
+        public string Id { get; set; }
+
         /// <summary>
-        /// 单据门店
+        /// 组织名称
         /// </summary>
-        public string djmd { get; set; }
-        
+        public string FullName { get; set; }
+
         /// <summary>
-        /// 门店名称
+        /// 组织编码
         /// </summary>
-        public string mdmc { get; set; }
-        
+        public string EnCode { get; set; }
+
         /// <summary>
-        /// 事业部
+        /// 组织分类【company-公司、department-部门】
         /// </summary>
-        public string syb { get; set; }
-        
+        public string Category { get; set; }
+
         /// <summary>
-        /// 教育部
+        /// 父级组织ID
         /// </summary>
-        public string jyb { get; set; }
-        
+        public string ParentId { get; set; }
+
         /// <summary>
-        /// 科技部
+        /// 组织主管ID
         /// </summary>
-        public string kjb { get; set; }
-        
+        public string ManagerId { get; set; }
+
         /// <summary>
-        /// 大项目部
+        /// 描述
         /// </summary>
-        public string dxmb { get; set; }
-        
+        public string Description { get; set; }
+
         /// <summary>
-        /// 归属起始时间
+        /// 排序码
         /// </summary>
-        public DateTime? gsqssj { get; set; }
-        
+        public long? SortCode { get; set; }
+
         /// <summary>
-        /// 归属终止时间
+        /// 是否启用
         /// </summary>
-        public DateTime? gszzsj { get; set; }
-        
+        public int? EnabledMark { get; set; }
+
         /// <summary>
-        /// 修改信息
+        /// 子组织列表
         /// </summary>
-        public string xgxx { get; set; }
-        
+        public List<OrganizeTreeOutput> Children { get; set; } = new List<OrganizeTreeOutput>();
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_mdgs/LqMdMdgsEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_mdgs/LqMdMdgsEntity.cs
deleted file mode 100644
index e7a0da8..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_mdgs/LqMdMdgsEntity.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Extend.Entitys.lq_md_mdgs
-{
-    /// <summary>
-    /// 门店归属
-    /// </summary>
-    [SugarTable("lq_md_mdgs")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class LqMdMdgsEntity
-    {
-        /// <summary>
-        /// 门店编码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 单据门店编号
-        /// </summary>
-        [SugarColumn(ColumnName = "djmdbh")]        
-        public string Djmdbh { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        [SugarColumn(ColumnName = "djmd")]        
-        public string Djmd { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        [SugarColumn(ColumnName = "mdmc")]        
-        public string Mdmc { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        [SugarColumn(ColumnName = "syb")]        
-        public string Syb { get; set; }
-        
-        /// <summary>
-        /// 教育部
-        /// </summary>
-        [SugarColumn(ColumnName = "jyb")]        
-        public string Jyb { get; set; }
-        
-        /// <summary>
-        /// 科技部
-        /// </summary>
-        [SugarColumn(ColumnName = "kjb")]        
-        public string Kjb { get; set; }
-        
-        /// <summary>
-        /// 大项目部
-        /// </summary>
-        [SugarColumn(ColumnName = "dxmb")]        
-        public string Dxmb { get; set; }
-        
-        /// <summary>
-        /// 归属起始时间
-        /// </summary>
-        [SugarColumn(ColumnName = "gsqssj")]        
-        public DateTime? Gsqssj { get; set; }
-        
-        /// <summary>
-        /// 归属终止时间
-        /// </summary>
-        [SugarColumn(ColumnName = "gszzsj")]        
-        public DateTime? Gszzsj { get; set; }
-        
-        /// <summary>
-        /// 修改信息
-        /// </summary>
-        [SugarColumn(ColumnName = "xgxx")]        
-        public string Xgxx { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
index 1c018a3..a7166ff 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
@@ -101,5 +101,47 @@ namespace NCC.Extend.Entitys.lq_mdxx
         [SugarColumn(ColumnName = "ywsb")]        
         public string Ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        [SugarColumn(ColumnName = "syb")]        
+        public string Syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        [SugarColumn(ColumnName = "jyb")]        
+        public string Jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        [SugarColumn(ColumnName = "kjb")]        
+        public string Kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        [SugarColumn(ColumnName = "dxmb")]        
+        public string Dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        [SugarColumn(ColumnName = "gsqssj")]        
+        public DateTime? Gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        [SugarColumn(ColumnName = "gszzsj")]        
+        public DateTime? Gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnName = "status")]        
+        public int? Status { get; set; }
+        
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqMdMdgsMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqMdMdgsMapper.cs
deleted file mode 100644
index 7bcc442..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqMdMdgsMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Extend.Entitys.Dto.LqMdMdgs;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Mapper.LqMdMdgs
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdgsService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdgsService.cs
deleted file mode 100644
index 0449d86..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdgsService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace NCC.Extend.Interfaces.LqMdMdgs
-{
-    public interface ILqMdMdgsService
-    {
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/Organize/IOrganizeService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/Organize/IOrganizeService.cs
new file mode 100644
index 0000000..cd7ee7a
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/Organize/IOrganizeService.cs
@@ -0,0 +1,116 @@
+using NCC.Common.Entity;
+using NCC.Extend.Entitys.Dto.Organize;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace NCC.Extend.Interfaces.Organize
+{
+    /// <summary>
+    /// 组织架构服务接口
+    /// </summary>
+    public interface IOrganizeService
+    {
+        #region 组织架构查询
+
+        /// <summary>
+        /// 获取组织架构列表
+        /// </summary>
+        /// <remarks>
+        /// 根据查询条件获取组织架构列表，支持分页查询
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "fullName": "技术部",
+        ///   "category": "department",
+        ///   "parentId": "ORG001",
+        ///   "currentPage": 1,
+        ///   "pageSize": 20
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - fullName: 组织名称（模糊查询）
+        /// - category: 组织分类（company-公司、department-部门）
+        /// - parentId: 父级组织ID
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页大小
+        /// </remarks>
+        /// <param name="input">查询参数</param>
+        /// <returns>组织架构列表</returns>
+        /// <response code="200">成功返回组织架构列表</response>
+        /// <response code="400">查询参数错误</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<dynamic> GetList(OrganizeListQueryInput input);
+
+        /// <summary>
+        /// 获取组织架构树形结构
+        /// </summary>
+        /// <remarks>
+        /// 获取完整的组织架构树形结构，包含所有子组织
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "parentId": "ORG001"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - parentId: 根节点组织ID（可选，不传则从顶级开始）
+        /// </remarks>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织架构树形结构</returns>
+        /// <response code="200">成功返回组织架构树</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<List<OrganizeTreeOutput>> GetTree(string parentId = null);
+
+        /// <summary>
+        /// 根据组织名称获取该机构下面的所有组织
+        /// </summary>
+        /// <remarks>
+        /// 通过组织名称查找组织，并返回该组织及其所有子组织
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "organizeName": "技术部"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - organizeName: 组织名称（支持模糊查询）
+        /// </remarks>
+        /// <param name="organizeName">组织名称</param>
+        /// <returns>组织及其子组织列表</returns>
+        /// <response code="200">成功返回组织列表</response>
+        /// <response code="400">组织名称不能为空</response>
+        /// <response code="404">未找到指定组织</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<dynamic> GetOrganizationsByName(string organizeName);
+
+        /// <summary>
+        /// 获取组织选择器数据
+        /// </summary>
+        /// <remarks>
+        /// 获取组织选择器所需的数据，用于下拉选择
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "parentId": "ORG001"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - parentId: 父级组织ID（可选）
+        /// </remarks>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织选择器数据</returns>
+        /// <response code="200">成功返回组织选择器数据</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<dynamic> GetSelector(string parentId = null);
+
+        #endregion
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdgsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdgsService.cs
deleted file mode 100644
index 628b74a..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdgsService.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Extend.Interfaces.LqMdMdgs;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Extend.Entitys.lq_md_mdgs;
-using NCC.Extend.Entitys.Dto.LqMdMdgs;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-
-namespace NCC.Extend.LqMdMdgs
-{
-    /// <summary>
-    /// 门店归属服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqMdMdgs", Order = 200)]
-    [Route("api/Extend/[controller]")]
-    public class LqMdMdgsService : ILqMdMdgsService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<LqMdMdgsEntity> _lqMdMdgsRepository;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="LqMdMdgsService"/>类型的新实例
-        /// </summary>
-        public LqMdMdgsService(
-            ISqlSugarRepository<LqMdMdgsEntity> lqMdMdgsRepository,
-            IUserManager userManager)
-        {
-            _lqMdMdgsRepository = lqMdMdgsRepository;            
-            _db = _lqMdMdgsRepository.Context;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取门店归属
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var entity = await _db.Queryable<LqMdMdgsEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<LqMdMdgsInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-		/// 获取门店归属列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] LqMdMdgsListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryGsqssj = input.gsqssj != null ? input.gsqssj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.First()) : null;
-            DateTime? endGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.Last()) : null;
-            List<string> queryGszzsj = input.gszzsj != null ? input.gszzsj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.First()) : null;
-            DateTime? endGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.Last()) : null;
-            var data = await _db.Queryable<LqMdMdgsEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.djmdbh), p => p.Djmdbh.Contains(input.djmdbh))
-                .WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Contains(input.djmd))
-                .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Equals(input.mdmc))
-                .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb))
-                .WhereIF(!string.IsNullOrEmpty(input.jyb), p => p.Jyb.Equals(input.jyb))
-                .WhereIF(!string.IsNullOrEmpty(input.kjb), p => p.Kjb.Equals(input.kjb))
-                .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj >= new DateTime(startGsqssj.ToDate().Year, startGsqssj.ToDate().Month, startGsqssj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj <= new DateTime(endGsqssj.ToDate().Year, endGsqssj.ToDate().Month, endGsqssj.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj >= new DateTime(startGszzsj.ToDate().Year, startGszzsj.ToDate().Month, startGszzsj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj <= new DateTime(endGszzsj.ToDate().Year, endGszzsj.ToDate().Month, endGszzsj.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.xgxx), p => p.Xgxx.Contains(input.xgxx))
-                .Select(it=> new LqMdMdgsListOutput
-                {
-                    id = it.Id,
-                    djmdbh=it.Djmdbh,
-                    djmd=it.Djmd,
-                    mdmc=it.Mdmc,
-                    syb=it.Syb,
-                    jyb=it.Jyb,
-                    kjb=it.Kjb,
-                    dxmb=it.Dxmb,
-                    gsqssj=it.Gsqssj,
-                    gszzsj=it.Gszzsj,
-                    xgxx=it.Xgxx,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqMdMdgsListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建门店归属
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] LqMdMdgsCrInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqMdMdgsEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-		/// 获取门店归属无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] LqMdMdgsListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryGsqssj = input.gsqssj != null ? input.gsqssj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.First()) : null;
-            DateTime? endGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.Last()) : null;
-            List<string> queryGszzsj = input.gszzsj != null ? input.gszzsj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.First()) : null;
-            DateTime? endGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.Last()) : null;
-            var data = await _db.Queryable<LqMdMdgsEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.djmdbh), p => p.Djmdbh.Contains(input.djmdbh))
-                .WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Contains(input.djmd))
-                .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Equals(input.mdmc))
-                .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb))
-                .WhereIF(!string.IsNullOrEmpty(input.jyb), p => p.Jyb.Equals(input.jyb))
-                .WhereIF(!string.IsNullOrEmpty(input.kjb), p => p.Kjb.Equals(input.kjb))
-                .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj >= new DateTime(startGsqssj.ToDate().Year, startGsqssj.ToDate().Month, startGsqssj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj <= new DateTime(endGsqssj.ToDate().Year, endGsqssj.ToDate().Month, endGsqssj.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj >= new DateTime(startGszzsj.ToDate().Year, startGszzsj.ToDate().Month, startGszzsj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj <= new DateTime(endGszzsj.ToDate().Year, endGszzsj.ToDate().Month, endGszzsj.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.xgxx), p => p.Xgxx.Contains(input.xgxx))
-                .Select(it=> new LqMdMdgsListOutput
-                {
-                    id = it.Id,
-                    djmdbh=it.Djmdbh,
-                    djmd=it.Djmd,
-                    mdmc=it.Mdmc,
-                    syb=it.Syb,
-                    jyb=it.Jyb,
-                    kjb=it.Kjb,
-                    dxmb=it.Dxmb,
-                    gsqssj=it.Gsqssj,
-                    gszzsj=it.Gszzsj,
-                    xgxx=it.Xgxx,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
-        }
-
-        /// <summary>
-		/// 导出门店归属
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] LqMdMdgsListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<LqMdMdgsListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<LqMdMdgsListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"门店编码\",\"field\":\"id\"},{\"value\":\"单据门店编号\",\"field\":\"djmdbh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"事业部\",\"field\":\"syb\"},{\"value\":\"教育部\",\"field\":\"jyb\"},{\"value\":\"科技部\",\"field\":\"kjb\"},{\"value\":\"大项目部\",\"field\":\"dxmb\"},{\"value\":\"归属起始时间\",\"field\":\"gsqssj\"},{\"value\":\"归属终止时间\",\"field\":\"gszzsj\"},{\"value\":\"修改信息\",\"field\":\"xgxx\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},]".ToList<ParamsModel>();           
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "门店归属.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<LqMdMdgsListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 批量删除门店归属
-        /// </summary>
-        /// <param name="ids">主键数组</param>
-        /// <returns></returns>
-        [HttpPost("batchRemove")]
-        public async Task BatchRemove([FromBody] List<string> ids)
-        {
-            var entitys = await _db.Queryable<LqMdMdgsEntity>().In(it => it.Id, ids).ToListAsync();
-            if (entitys.Count > 0)
-            {
-                try
-                {
-                    //开启事务
-                    _db.BeginTran();
-                    //批量删除门店归属
-                    await _db.Deleteable<LqMdMdgsEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh(ErrorCode.COM1002);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 更新门店归属
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] LqMdMdgsUpInput input)
-        {
-            var entity = input.Adapt<LqMdMdgsEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除门店归属
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var entity = await _db.Queryable<LqMdMdgsEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<LqMdMdgsEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
index 0918bda..808858b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
@@ -107,6 +107,10 @@ namespace NCC.Extend.LqMdxx
                     gsmc=it.Gsmc,
                     fr=it.Fr,
                     ywsb=it.Ywsb,
+                    jyb=it.Jyb,
+                    kjb=it.Kjb,
+                    dxmb=it.Dxmb,
+                    syb=it.Syb,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
         }
@@ -261,6 +265,7 @@ namespace NCC.Extend.LqMdxx
         public async Task Update(string id, [FromBody] LqMdxxUpInput input)
         {
             var entity = input.Adapt<LqMdxxEntity>();
+            entity.Id = id; // 设置主键ID
             var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/OrganizeService.cs b/netcore/src/Modularity/Extend/NCC.Extend/OrganizeService.cs
new file mode 100644
index 0000000..99e6008
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend/OrganizeService.cs
@@ -0,0 +1,299 @@
+using NCC.Common.Entity;
+using NCC.Extend.Entitys.Dto.Organize;
+using NCC.Extend.Interfaces.Organize;
+using NCC.System.Entitys.Permission;
+using NCC.Dependency;
+using NCC.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace NCC.Extend
+{
+    /// <summary>
+    /// 组织架构服务实现
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "绿纤组织架构服务", Name = "Organize", Order = 201)]
+    [Route("api/Extend/[controller]")]
+    public class OrganizeService : IOrganizeService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarClient _db;
+
+        /// <summary>
+        /// 初始化组织架构服务
+        /// </summary>
+        /// <param name="db">数据库客户端</param>
+        public OrganizeService(ISqlSugarClient db)
+        {
+            _db = db;
+        }
+
+        #region 组织架构查询
+
+        /// <summary>
+        /// 获取组织架构列表
+        /// </summary>
+        /// <param name="input">查询参数</param>
+        /// <returns>组织架构列表</returns>
+        [HttpGet("")]
+        public async Task<dynamic> GetList([FromQuery] OrganizeListQueryInput input)
+        {
+            var query = _db.Queryable<OrganizeEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.FullName), x => x.FullName.Contains(input.FullName))
+                .WhereIF(!string.IsNullOrEmpty(input.EnCode), x => x.EnCode.Contains(input.EnCode))
+                .WhereIF(!string.IsNullOrEmpty(input.Category), x => x.Category == input.Category)
+                .WhereIF(!string.IsNullOrEmpty(input.ParentId), x => x.ParentId == input.ParentId)
+                .WhereIF(input.EnabledMark.HasValue, x => x.EnabledMark == input.EnabledMark)
+                .Where(x => x.DeleteMark == null)
+                .OrderBy(x => x.SortCode, OrderByType.Asc)
+                .OrderBy(x => x.CreatorTime, OrderByType.Desc);
+
+            var total = await query.CountAsync();
+            var list = await query
+                .Select(x => new OrganizeListOutput
+                {
+                    Id = x.Id,
+                    FullName = x.FullName,
+                    EnCode = x.EnCode,
+                    Category = x.Category,
+                    ParentId = x.ParentId,
+                    ManagerId = x.ManagerId,
+                    Description = x.Description,
+                    SortCode = x.SortCode,
+                    EnabledMark = x.EnabledMark,
+                    CreatorTime = x.CreatorTime
+                })
+                .ToPagedListAsync(input.currentPage, input.pageSize);
+
+            // 获取父级组织名称和主管姓名
+            var parentIds = list.list.Where(x => !string.IsNullOrEmpty(x.ParentId)).Select(x => x.ParentId).Distinct().ToList();
+            var managerIds = list.list.Where(x => !string.IsNullOrEmpty(x.ManagerId)).Select(x => x.ManagerId).Distinct().ToList();
+
+            var parentMap = new Dictionary<string, string>();
+            var managerMap = new Dictionary<string, string>();
+
+            if (parentIds.Any())
+            {
+                var parents = await _db.Queryable<OrganizeEntity>()
+                    .Where(x => parentIds.Contains(x.Id))
+                    .Select(x => new { x.Id, x.FullName })
+                    .ToListAsync();
+                parentMap = parents.ToDictionary(x => x.Id, x => x.FullName);
+            }
+
+            if (managerIds.Any())
+            {
+                var managers = await _db.Queryable<UserEntity>()
+                    .Where(x => managerIds.Contains(x.Id))
+                    .Select(x => new { x.Id, x.RealName })
+                    .ToListAsync();
+                managerMap = managers.ToDictionary(x => x.Id, x => x.RealName);
+            }
+
+            // 填充父级组织名称和主管姓名
+            foreach (var item in list.list)
+            {
+                if (!string.IsNullOrEmpty(item.ParentId) && parentMap.ContainsKey(item.ParentId))
+                {
+                    item.ParentName = parentMap[item.ParentId];
+                }
+
+                if (!string.IsNullOrEmpty(item.ManagerId) && managerMap.ContainsKey(item.ManagerId))
+                {
+                    item.ManagerName = managerMap[item.ManagerId];
+                }
+
+                // 获取子组织数量
+                item.ChildrenCount = await _db.Queryable<OrganizeEntity>()
+                    .Where(x => x.ParentId == item.Id && x.DeleteMark == null)
+                    .CountAsync();
+            }
+
+            return new { list = list.list, total };
+        }
+
+        /// <summary>
+        /// 获取组织架构树形结构
+        /// </summary>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织架构树形结构</returns>
+        [HttpGet("Tree")]
+        public async Task<List<OrganizeTreeOutput>> GetTree([FromQuery] string parentId = null)
+        {
+            var query = _db.Queryable<OrganizeEntity>()
+                .Where(x => x.DeleteMark == null)
+                .WhereIF(!string.IsNullOrEmpty(parentId), x => x.ParentId == parentId)
+                .WhereIF(string.IsNullOrEmpty(parentId), x => string.IsNullOrEmpty(x.ParentId))
+                .OrderBy(x => x.SortCode, OrderByType.Asc)
+                .OrderBy(x => x.CreatorTime, OrderByType.Desc);
+
+            var list = await query
+                .Select(x => new OrganizeTreeOutput
+                {
+                    Id = x.Id,
+                    FullName = x.FullName,
+                    EnCode = x.EnCode,
+                    Category = x.Category,
+                    ParentId = x.ParentId,
+                    ManagerId = x.ManagerId,
+                    Description = x.Description,
+                    SortCode = x.SortCode,
+                    EnabledMark = x.EnabledMark
+                })
+                .ToListAsync();
+
+
+            // 构建树形结构
+            return BuildTree(list, parentId);
+        }
+
+        /// <summary>
+        /// 根据组织名称获取该机构下面的所有组织
+        /// </summary>
+        /// <param name="organizeName">组织名称</param>
+        /// <returns>组织及其子组织列表</returns>
+        [HttpGet("GetByName")]
+        public async Task<dynamic> GetOrganizationsByName([FromQuery] string organizeName)
+        {
+            if (string.IsNullOrEmpty(organizeName))
+            {
+                throw new ArgumentException("组织名称不能为空", nameof(organizeName));
+            }
+
+            // 查找匹配的组织
+            var matchedOrganizes = await _db.Queryable<OrganizeEntity>().Where(x => x.FullName == organizeName && x.DeleteMark == null).FirstAsync();
+            if (matchedOrganizes == null)
+            {
+                throw new ArgumentException("未找到指定组织", nameof(organizeName));
+            }
+            var result = await _db.Queryable<OrganizeEntity>().Where(x => x.ParentId == matchedOrganizes.Id && x.DeleteMark == null).Select(x => new OrganizeTreeOutput
+            {
+                Id = x.Id,
+                FullName = x.FullName,
+                EnCode = x.EnCode,
+                Category = x.Category,
+            }).ToListAsync();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取组织选择器数据
+        /// </summary>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织选择器数据</returns>
+        [HttpGet("Selector")]
+        public async Task<dynamic> GetSelector([FromQuery] string parentId = null)
+        {
+            var query = _db.Queryable<OrganizeEntity>()
+                .Where(x => x.DeleteMark == null && x.EnabledMark == 1)
+                .WhereIF(!string.IsNullOrEmpty(parentId), x => x.ParentId == parentId)
+                .WhereIF(string.IsNullOrEmpty(parentId), x => string.IsNullOrEmpty(x.ParentId))
+                .OrderBy(x => x.SortCode, OrderByType.Asc)
+                .OrderBy(x => x.CreatorTime, OrderByType.Desc);
+
+            var list = await query
+                .Select(x => new
+                {
+                    id = x.Id,
+                    fullName = x.FullName,
+                    enCode = x.EnCode,
+                    category = x.Category,
+                    parentId = x.ParentId
+                })
+                .ToListAsync();
+
+            return new { list };
+        }
+
+        #endregion
+
+        #region 私有方法
+
+        /// <summary>
+        /// 构建树形结构
+        /// </summary>
+        /// <param name="list">组织列表</param>
+        /// <param name="parentId">父级ID</param>
+        /// <returns>树形结构</returns>
+        private List<OrganizeTreeOutput> BuildTree(List<OrganizeTreeOutput> list, string parentId)
+        {
+            var result = new List<OrganizeTreeOutput>();
+            var parentIdValue = parentId ?? "";
+
+            foreach (var item in list.Where(x => x.ParentId == parentIdValue))
+            {
+                var children = BuildTree(list, item.Id);
+                item.Children = children;
+                result.Add(item);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 获取所有子组织
+        /// </summary>
+        /// <param name="parentId">父级组织ID</param>
+        /// <returns>子组织列表</returns>
+        private async Task<List<OrganizeTreeOutput>> GetAllChildren(string parentId)
+        {
+            var children = await _db.Queryable<OrganizeEntity>()
+                .Where(x => x.ParentId == parentId && x.DeleteMark == null)
+                .Select(x => new OrganizeTreeOutput
+                {
+                    Id = x.Id,
+                    FullName = x.FullName,
+                    EnCode = x.EnCode,
+                    Category = x.Category,
+                    ParentId = x.ParentId,
+                    ManagerId = x.ManagerId,
+                    Description = x.Description,
+                    SortCode = x.SortCode,
+                    EnabledMark = x.EnabledMark
+                })
+                .ToListAsync();
+
+            var allChildren = new List<OrganizeTreeOutput>(children);
+
+            foreach (var child in children)
+            {
+                var grandChildren = await GetAllChildren(child.Id);
+                allChildren.AddRange(grandChildren);
+            }
+
+            return allChildren;
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// 组织比较器
+    /// </summary>
+    public class OrganizeComparer : IEqualityComparer<OrganizeTreeOutput>
+    {
+        /// <summary>
+        /// 比较两个组织是否相等
+        /// </summary>
+        /// <param name="x">组织1</param>
+        /// <param name="y">组织2</param>
+        /// <returns>是否相等</returns>
+        public bool Equals(OrganizeTreeOutput x, OrganizeTreeOutput y)
+        {
+            return x?.Id == y?.Id;
+        }
+
+        /// <summary>
+        /// 获取组织的哈希码
+        /// </summary>
+        /// <param name="obj">组织对象</param>
+        /// <returns>哈希码</returns>
+        public int GetHashCode(OrganizeTreeOutput obj)
+        {
+            return obj?.Id?.GetHashCode() ?? 0;
+        }
+    }
+}
diff --git a/参考资料/.DS_Store b/参考资料/.DS_Store
index a52bd24..e4bd939 100644
--- a/参考资料/.DS_Store
+++ b/参考资料/.DS_Store
diff --git a/参考资料/整体-8.15/.DS_Store b/参考资料/整体-8.15/.DS_Store
index 65c6b01..3b56575 100644
--- a/参考资料/整体-8.15/.DS_Store
+++ b/参考资料/整体-8.15/.DS_Store
diff --git a/数据库说明.md b/数据库说明.md
index 2e955bb..38bafc4 100644
--- a/数据库说明.md
+++ b/数据库说明.md
@@ -26,9 +26,14 @@
 - **业务字段**：使用拼音首字母缩写
 - **时间字段**：统一使用 `datetime` 类型
 - **金额字段**：统一使用 `decimal` 类型
+- **删除标记**：`DeleteMark` 字段为 `null` 表示未删除，为 `0` 或其他值表示已删除
+
+### 重要字段规则
+- **base_organize 表删除标记**：`DeleteMark` 字段为 `null` 表示未删除，为 `0` 或其他值表示已删除
 
 ### 已弃用表
 - **lq_ryzl (人员资料表)** - 已弃用，人员信息现在使用系统用户表 `BASE_USER` 管理
+- **lq_mdxx_mdgs (门店归属表)** - 已弃用，门店归属信息已整合到 `lq_mdxx` 表中
 
 ---
 
@@ -39,27 +44,34 @@
 #### lq_mdxx (门店资料)
 | 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
 |--------|----------|----------|----------|------|
-| F_Id | varchar | NO | 主键 | PRI |
-| mdbm | varchar | YES | 门店编码 | |
-| djmdbh | varchar | YES | 单据门店编号 | |
-| djmd | varchar | YES | 单据门店 | |
-| dm | varchar | YES | 店名 | |
-| cs | varchar | YES | 城市 | |
-| dz | varchar | YES | 地址 | |
-| xm | varchar | YES | 姓名 | |
-| dhhm | varchar | YES | 电话号码 | |
-| zj | varchar | YES | 座机 | |
+| F_Id | varchar(50) | NO | 主键 | PRI |
+| mdbm | varchar(50) | YES | 门店编码 | |
+| djmdbh | varchar(50) | YES | 单据门店编号 | |
+| djmd | varchar(50) | YES | 单据门店 | |
+| dm | varchar(50) | YES | 店名 | |
+| cs | varchar(50) | YES | 城市 | |
+| dz | varchar(50) | YES | 地址 | |
+| xm | varchar(50) | YES | 姓名 | |
+| dhhm | varchar(50) | YES | 电话号码 | |
+| zj | varchar(50) | YES | 座机 | |
 | kysj | datetime | YES | 开业时间 | |
-| zxzt | varchar | YES | 最新状态 | |
-| gsmc | varchar | YES | 工商名称 | |
-| fr | varchar | YES | 法人 | |
-| ywsb | varchar | YES | 有无社保 | |
+| zxzt | varchar(50) | YES | 最新状态 | |
+| gsmc | varchar(50) | YES | 工商名称 | |
+| fr | varchar(50) | YES | 法人 | |
+| ywsb | varchar(50) | YES | 有无社保 | |
+| syb | varchar(50) | YES | 事业部 | |
+| jyb | varchar(50) | YES | 教育部 | |
+| kjb | varchar(50) | YES | 科技部 | |
+| dxmb | varchar(50) | YES | 大项目部 | |
+| gsqssj | datetime | YES | 归属起始时间 | |
+| gszzsj | datetime | YES | 归属终止时间 | |
+| status | int(11) | YES | 状态 | |
 
 #### lq_md_mdlbjhsxx (门店类别及核算信息)
 - 用于存储门店的分类信息和核算相关配置
 
-#### lq_md_mdgs (门店归属)
-- 用于存储门店的归属关系
+#### ~~lq_md_mdgs (门店归属)~~ - 已弃用
+- ~~用于存储门店的归属关系~~ - 已整合到 `lq_mdxx` 表中
 
 #### lq_md_mdwy (门店物业)
 - 用于存储门店物业相关信息