sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-05-06 22:25:55 +08:00
parent ec7a9dbb08
commit a6735b2f79
4 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.com_flag, d.type_flag
from sys_dept d
left join sys_user u on u.dept_id = d.dept_id
where u.user_name = #{userName}
where u.user_name = #{userName} and u.del_flag=0
</select>
<select id="getRootDept" parameterType="Long" resultMap="SysDeptResult">

4
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -142,11 +142,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
select user_id, user_name from sys_user where user_name = #{userName} limit 1
</select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
</select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">

61
ruoyi-ui/src/views/system/user/index.vue
View File

@ -316,8 +316,12 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
<el-form-item label="用户姓名" prop="nickName">
<el-input
v-model="form.nickName"
placeholder="请输入用户姓名"
maxlength="30"
/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -331,23 +335,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="form.phonenumber"
placeholder="请输入手机号码"
maxlength="11"
:disabled="form.userId != undefined"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
@ -378,6 +365,27 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="form.phonenumber"
placeholder="请输入手机号码"
maxlength="11"
:disabled="form.userId != undefined"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱地址" prop="email">
<el-input
v-model="form.email"
placeholder="请输入邮箱地址"
maxlength="50"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
@ -392,7 +400,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态">
<el-form-item label="用户状态">
<el-radio-group v-model="form.status" style="width: 100%">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
@ -406,11 +414,11 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="岗位">
<el-form-item label="用户岗位">
<el-select
v-model="form.postIds"
multiple
placeholder="请选择岗位"
placeholder="请选择用户岗位"
style="width: 100%"
>
<el-option
@ -424,11 +432,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-form-item label="用户角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
placeholder="请选择用户角色"
style="width: 100%"
>
<el-option
@ -442,7 +450,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="false">
<el-col :span="24">
<el-form-item label="备注">
<el-input
@ -455,6 +463,9 @@
</el-row>
</el-form>
<div class="page-warning">
<p v-if="form.userId != undefined">
<strong style="color: #f56c6c">“修改用户账号”请联系系统运维人员！！！</strong>
</p>
<p>
<strong style="color: #e6a23c">“总包公司个人”</strong>
有项目人员中担任职务项目的权限。

5
yanzhu-jh/src/main/java/com/yanzhu/jh/flow/domain/FlowLabourInfo.java
View File

@ -29,7 +29,6 @@ public class FlowLabourInfo extends BaseEntity
private String projectName;
/** 总包单位 */
@Excel(name = "总包单位")
private Long deptId;
/** 总包单位名称 */
@ -73,11 +72,11 @@ public class FlowLabourInfo extends BaseEntity
private String files;
/** 审核状态 */
@Excel(name = "审核状态")
@Excel(name = "审核状态", dictType = "flow_labou_appstatus")
private String approveStatus;
/** 是否有效 */
@Excel(name = "是否有效")
@Excel(name = "是否有效", dictType = "sys_common_isdel")
private Long isDel;
public void setId(Long id)