xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'24'

This commit is contained in:
xd 2024-05-17 15:32:19 +08:00
parent 840c62fd3d
commit 1d42c2f5d6
6 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -1,11 +1,11 @@
#for tests only !
#Fri May 17 13:23:58 CST 2024
#Fri May 17 13:48:33 CST 2024
jco.destination.pool_capacity=10
jco.client.lang=ZH
jco.client.ashost=172.19.0.120
jco.client.ashost=172.19.0.125
jco.client.saprouter=
jco.client.user=RFC
jco.client.sysnr=00
jco.destination.peak_limit=10
jco.client.passwd=654321
jco.client.client=300
jco.client.passwd=wWOv8)*JSX[bw5-}QU!OM5!]2$[(}8v-{aXJ^%9]cN,q[/XI
jco.client.client=800

11
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View File

@ -89,6 +89,9 @@ public class SysUser extends BaseEntity
/** 角色ID */
private Long roleId;
private String sapUserBm;
private String sapUserName;
public SysUser()
{
@ -297,6 +300,14 @@ public class SysUser extends BaseEntity
this.roleId = roleId;
}
public String getSapUserBm() { return sapUserBm; }
public void setSapUserBm(String sapUserBm) { this.sapUserBm = sapUserBm; }
public String getSapUserName() { return sapUserName; }
public void setSapUserName(String sapUserName) { this.sapUserName = sapUserName; }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@ -23,6 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="sapUserBm" column="sap_user_bm" />
<result property="sapUserName" column="sap_user_name" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@ -57,8 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
su.sap_user_bm,su.sap_user_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_sap_user su on su.sys_user_name = u.user_name
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}

2
ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue
View File

@ -251,6 +251,8 @@
var json = {};
json.userName = this.allUserMap.get(item).userName || '';
json.nickName = this.allUserMap.get(item).nickName || '';
json.sapUserBm = this.allUserMap.get(item).sapUserBm || '';
json.sapUserName = this.allUserMap.get(item).sapUserName || '';
result.push(json);
}
})

2
ruoyi-ui/src/views/noticeUserSelect/noticeUserSelect/index.vue
View File

@ -108,8 +108,6 @@
},
//选择人的确定按钮事件 submitPeople(nikeNamelist)方法传参一个默认接收用户昵称数组 submitPeople(peopleList,nikeNamelist)方法传参两个则是接收用户昵称数组和用户账号数组
submitPeople(peopleList,nickNameList){
console.log(peopleList);
console.log(nickNameList);
this.selectedPeoples = this.selectedPeoples.concat(nickNameList)
this.selectedPeoples = this.unique(this.selectedPeoples)
this.peopleOpen=false;

4
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -816,9 +816,9 @@ export default {
quotSalesmanName: [
{ required: true, message: "业务员不能为空", trigger: "blur" }
],
/*quotCustomerName: [
quotCustomerName: [
{ required: true, message: "客户名称不能为空", trigger: "blur" }
],*/
],
quotProject: [
{ required: true, message: "项目名称不能为空", trigger: "blur" }
],