Commit ea092207 by java-李谡

修改jdbc连接,代码review,去除UI切换

parent 90db84a3
...@@ -171,7 +171,9 @@ ...@@ -171,7 +171,9 @@
name, name,
email, email,
phone, phone,
phone_number,
mobile, mobile,
mobile_nubmer,
user_type, user_type,
create_by, create_by,
create_date, create_date,
...@@ -192,7 +194,9 @@ ...@@ -192,7 +194,9 @@
#{name}, #{name},
#{email}, #{email},
#{phone}, #{phone},
#{phoneNumber},
#{mobile}, #{mobile},
#{mobileNumber},
#{userType}, #{userType},
#{createBy.id}, #{createBy.id},
#{createDate}, #{createDate},
...@@ -258,6 +262,7 @@ ...@@ -258,6 +262,7 @@
phone = #{phone}, phone = #{phone},
phone_number = #{phoneNumber}, phone_number = #{phoneNumber},
mobile = #{mobile}, mobile = #{mobile},
mobile_nubmer = #{mobileNumber},
user_type = #{userType}, user_type = #{userType},
update_by = #{updateBy.id}, update_by = #{updateBy.id},
update_date = #{updateDate}, update_date = #{updateDate},
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
<sql id="officeJoins"> <sql id="officeJoins">
LEFT JOIN sys_office p ON p.id = a.parent_id LEFT JOIN sys_office p ON p.id = a.parent_id
LEFT JOIN sys_area ar ON ar.id = a.area_id LEFT JOIN sys_area ar ON ar.id = a.area_id
LEFT JOIN SYS_USER pp ON pp.id = a.primary_person LEFT JOIN sys_user pp ON pp.id = a.primary_person
LEFT JOIN SYS_USER dp ON dp.id = a.deputy_person LEFT JOIN sys_user dp ON dp.id = a.deputy_person
</sql> </sql>
<select id="get" resultType="Office"> <select id="get" resultType="Office">
......
...@@ -51,7 +51,16 @@ public class UserProfileEntity extends DataEntity<UserProfileEntity> { ...@@ -51,7 +51,16 @@ public class UserProfileEntity extends DataEntity<UserProfileEntity> {
private Date oldLoginDate; // 上次登陆日期 private Date oldLoginDate; // 上次登陆日期
private String usersForSeat; private String usersForSeat;
private String phoneNumber; private String phoneNumber;
private String mobileNumber;
public String getMobileNumber() {
return mobileNumber;
}
public void setMobileNumber(String mobileNumber) {
this.mobileNumber = mobileNumber;
}
public String getPhoneNumber() { public String getPhoneNumber() {
return phoneNumber; return phoneNumber;
} }
......
...@@ -134,6 +134,8 @@ public class UserProfileController extends BaseController { ...@@ -134,6 +134,8 @@ public class UserProfileController extends BaseController {
public String save(UserProfileEntity userProfileEntity, RedirectAttributes redirectAttributes, Model model) { public String save(UserProfileEntity userProfileEntity, RedirectAttributes redirectAttributes, Model model) {
Integer oldHuaweiStatus = null; //旧的华为状态 Integer oldHuaweiStatus = null; //旧的华为状态
if (StringUtils.isBlank(userProfileEntity.getId())) { // 新增操作 if (StringUtils.isBlank(userProfileEntity.getId())) { // 新增操作
userProfileEntity.setMobileNumber(userProfileEntity.getMobile());
userProfileEntity.setPhoneNumber(userProfileEntity.getPhone());
if (userProfileEntity.getUserType().equals("3")) { // 外部联系人新增 if (userProfileEntity.getUserType().equals("3")) { // 外部联系人新增
userProfileEntity.setOffice(new Office("0")); userProfileEntity.setOffice(new Office("0"));
userProfileEntity.setLoginName(String.valueOf(System.currentTimeMillis())); userProfileEntity.setLoginName(String.valueOf(System.currentTimeMillis()));
...@@ -158,8 +160,10 @@ public class UserProfileController extends BaseController { ...@@ -158,8 +160,10 @@ public class UserProfileController extends BaseController {
userProfileEntity2.setDutyName(userProfileEntity.getDutyName()); userProfileEntity2.setDutyName(userProfileEntity.getDutyName());
userProfileEntity2.setFax(userProfileEntity.getFax()); userProfileEntity2.setFax(userProfileEntity.getFax());
userProfileEntity2.setPhone(userProfileEntity.getPhone()); userProfileEntity2.setPhone(userProfileEntity.getPhone());
userProfileEntity2.setPhoneNumber(userProfileEntity.getPhone());
userProfileEntity2.setEmail(userProfileEntity.getEmail()); userProfileEntity2.setEmail(userProfileEntity.getEmail());
userProfileEntity2.setMobile(userProfileEntity.getMobile()); userProfileEntity2.setMobile(userProfileEntity.getMobile());
userProfileEntity2.setMobileNumber(userProfileEntity.getMobile());
if (StringUtils.isBlank(userProfileEntity.getPhoto())) { if (StringUtils.isBlank(userProfileEntity.getPhoto())) {
userProfileEntity.setPhoto(GConstants.OUTER_USER_PHOTO); userProfileEntity.setPhoto(GConstants.OUTER_USER_PHOTO);
} }
...@@ -179,6 +183,7 @@ public class UserProfileController extends BaseController { ...@@ -179,6 +183,7 @@ public class UserProfileController extends BaseController {
userProfileEntity2.setFax(userProfileEntity.getFax()); userProfileEntity2.setFax(userProfileEntity.getFax());
userProfileEntity2.setPhone(userProfileEntity.getPhone()); userProfileEntity2.setPhone(userProfileEntity.getPhone());
userProfileEntity2.setMobile(userProfileEntity.getMobile()); userProfileEntity2.setMobile(userProfileEntity.getMobile());
userProfileEntity2.setMobileNumber(userProfileEntity.getMobile());
userProfileEntity2.setEmail(userProfileEntity.getEmail()); userProfileEntity2.setEmail(userProfileEntity.getEmail());
userProfileEntity2.setHuaweiUnicall(userProfileEntity.getHuaweiUnicall()); userProfileEntity2.setHuaweiUnicall(userProfileEntity.getHuaweiUnicall());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment