fix:完善细节

admin-ui/src/views/system/dept/edit.vue

@@ -5,7 +5,7 @@
         <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级科室" />
       </el-form-item>
       <el-form-item label="科室名称" prop="deptName"><el-input v-model="form.deptName" placeholder="请输入科室名称" /></el-form-item>
-      <div v-if="form.parentId != 0 && form.ancestors.length == 3">
+      <div v-if="form.parentId != 0">
         <el-form-item label="科室介绍" prop="brief">
           <editor v-model="form.brief" placeholder="请输入"></editor>
         </el-form-item>

admin-ui/src/views/system/dept/index.vue

@@ -26,7 +26,7 @@
       <el-table-column label="操作" align="center" width="220">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']" v-if="scope.row.ancestors.length < 3">新增</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']" v-if="scope.row.parentId==0">新增</el-button>
           <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>

admin-ui/src/views/system/user/index.vue

@@ -11,8 +11,8 @@
           <el-form-item label="账号" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" class="se" />
           </el-form-item>
-          <el-form-item label="手机号" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" class="se" />
+          <el-form-item label="姓名" prop="nickName">
+            <el-input v-model="queryParams.nickName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" class="se" />
           </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>

app/pages/department/index.vue

@@ -1,16 +1,12 @@
 <template>
 	<view class="msilde">
 		<view class="left">
-			<u-collapse accordion >
-				<u-collapse-item :title="d.deptName" :name="d.deptId" v-for="(d, index) in list" :key="d.deptName">
-					<view :class="{ active: index == i.current }" v-for="(i, index) in d.children" :key="i.deptName" class="item" @click="selected(i, index)">{{ i.deptName }}</view>
-				</u-collapse-item>
-			</u-collapse>
+			<view :class="{ active: index == current }" v-for="(item, index) in list" :key="index" class="item" @click="selected(item, index)">{{ item.deptName }}</view>
 		</view>
 		<view class="right">
 			<view class="contents">
-				<u-divider :text="item.deptName + '介绍'" v-if="item.deptName"></u-divider>
-				<u-parse :content="item.brief"></u-parse>
+				<u-parse :content="item.brief" v-if="item.brief"></u-parse>
+				<u-empty v-else text="整理资料中..."></u-empty>
 			</view>
 		</view>
 	</view>
@@ -20,6 +16,7 @@
 export default {
 	data() {
 		return {
+			current: 0,
 			item: {},
 			list: []
 		};
@@ -33,17 +30,19 @@ export default {
 				url: '/app/department/list',
 				success: (res) => {
 					this.list = res.data.data;
+					this.selected(this.list[0], 0);
 				}
 			});
 		},
 		selected(item, index) {
-			this.list.flatMap((i) => i.children).forEach((j) => (j.current = -1));
-			item.current = index;
+			this.current = index;
 			this.http.request({
 				url: '/app/department/detail/' + item.deptId,
 				success: (res) => {
 					this.item = res.data.data;
-					this.item.brief = res.data.data.brief.replace(new RegExp('/profile/upload/', 'g'), this.http.ip + '/profile/upload/');
+					if (res.data.data.brief) {
+						this.item.brief = res.data.data.brief.replace(new RegExp('/profile/upload/', 'g'), this.http.ip + '/profile/upload/');
+					}
 				}
 			});
 		}

app/pages/doctor/index.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="msilde">
 		<view class="left">
-			<u-collapse accordion >
-				<u-collapse-item :title="d.deptName" :name="d.deptId" v-for="(d, index) in list" :key="d.deptName">
-					<view :class="{ active: index == i.current }" v-for="(i, index) in d.children" :key="i.deptName" class="item" @click="selected(i, index)">{{ i.deptName }}</view>
-				</u-collapse-item>
-			</u-collapse>
+			<view :class="{ active: index == current }" v-for="(item, index) in list" :key="index" class="item" @click="selected(item, index)">{{ item.deptName }}</view>
 		</view>
 		<view class="right">
 			<view class="list" v-if="doctor_list.length > 0">
@@ -26,9 +22,10 @@
 export default {
 	data() {
 		return {
+			current: 0,
 			ip: this.http.ip,
 			doctor_list: {},
-			list: [{ deptId: 0 }]
+			list: []
 		};
 	},
 	onLoad(e) {
@@ -40,15 +37,12 @@ export default {
 				url: '/app/department/list',
 				success: (res) => {
 					this.list = res.data.data;
+					this.selected(this.list[0], 0);
 				}
 			});
 		},
-		open() {
-			this.current = -1;
-		},
 		selected(item, index) {
-			this.list.flatMap((i) => i.children).forEach((j) => (j.current = -1));
-			item.current = index;
+			this.current = index;
 			this.http.request({
 				url: '/app/doctor/list',
 				data: { deptId: item.deptId },

app/pages/index/index.vue

@@ -18,7 +18,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="item" @click="go('/pages/department/index')">
+			<view class="item" @click="go('/pages/introduction/index')">
 				<view class="out">
 					<view class="int" style="height: 87px; background-color: #ddf8f3">
 						<view class="icon" style="color: #22b789">&#xe606;</view>
@@ -45,7 +45,7 @@
 			<view class="gg">
 				<view class="title">权威专家</view>
 				<view class="bor"></view>
-				<view class="more" @click="go('/pages/news/index?type=新闻资讯')">
+				<view class="more" @click="go('/pages/doctor/index')">
 					<text>更多</text>
 					<text class="icon">&#xe62b;</text>
 				</view>
@@ -64,7 +64,7 @@
 			<view class="gg">
 				<view class="title">健康知识</view>
 				<view class="bor"></view>
-				<view class="more" @click="go('/pages/news/index?type=新闻资讯')">
+				<view class="more" @click="go('/pages/knowledge/index')">
 					<text>更多</text>
 					<text class="icon">&#xe62b;</text>
 				</view>

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -66,12 +66,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public AjaxResult treeList() {
         List<Map<String, Object>> all = deptMapper.treeList();
         List<Map<String, Object>> list = all.stream().filter(r -> r.get("parentId").toString().equals("100")).collect(Collectors.toList());
-        for (Map record : list) {
-            List<Map<String, Object>> children = all.stream().filter(r -> r.get("parentId").toString().equals(record.get("deptId").toString())).collect(Collectors.toList());
-            if (children.size() > 0) {
-                record.put("children", children);
-            }
-        }
         return AjaxResult.success(list);
     }
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>