productDev/dmvisit.git

			@@ -11,6 +11,9 @@
			<el-form-item label="手机号码" prop="mobile">
			<el-input v-model="searchForm.mobile" v-trim placeholder="请输入手机号码" @keypress.enter.native="search"/>
			</el-form-item>
			<el-form-item label="组织" prop="companyName">
			<el-input v-model="searchForm.companyName" v-trim placeholder="请输入组织" @keypress.enter.native="search"/>
			</el-form-item>
			<!-- <el-form-item label="所属部门" prop="rootDeptId">-->
			<!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="请选择所属部门" clearable/>-->
			<!-- </el-form-item>-->
			@@ -45,6 +48,7 @@
			<el-table-column prop="realname" label="姓名" min-width="100px" fixed="left"></el-table-column>
			<el-table-column prop="username" label="用户名" min-width="120px"></el-table-column>
			<el-table-column prop="empNo" label="工号" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
			<el-table-column prop="companyName" label="所属组织" min-width="250px"></el-table-column>
			<!-- <el-table-column prop="department" label="部门" min-width="120px">-->
			<!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>-->
			<!-- </el-table-column>-->
			@@ -129,6 +133,7 @@
			realname: '', // 姓名
			rootDeptId: null, // 部门ID
			positionId: null, // 岗位ID
			companyName: null, // 企业名称
			mobile: '' // 手机号码
			}
			}

			@@ -35,6 +35,8 @@

			@ApiModelProperty(value = "手机号码")
			private String mobile;
			@ApiModelProperty(value = "企业名称")
			private String companyName;

			@ApiModelProperty(value = "角色ID")
			private Integer roleId;

			@@ -27,7 +27,7 @@
			sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
			create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
			update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
			sd.name as companyName
			sd.company_name_path as companyName
			FROM `SYSTEM_USER` usr
			LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
			LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
			@@ -60,6 +60,9 @@
			<if test="dto.mobile != null and dto.mobile != ''">
			AND usr.`MOBILE` LIKE CONCAT('%', #{dto.mobile}, '%')
			</if>
			<if test="dto.companyName != null and dto.companyName != ''">
			AND sd.`company_name_path` LIKE CONCAT('%', #{dto.companyName}, '%')
			</if>
			<if test="dto.status != null ">
			AND usr.`status` = #{dto.status}
			</if>

	admin/src/views/system/user.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/system_service/src/main/resources/mappers/SystemUserMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史