diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerQuery.java index d258005fa4..171fccb870 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerQuery.java @@ -30,8 +30,8 @@ public class BaseManufacturerQuery implements Query { private String supplierType; @ApiModelProperty("所属分公司sid") private String useOrgSid; - @ApiModelProperty("办公电话") - private String contactTelePhone; + @ApiModelProperty("厂商办公电话") + private String manufacturerTelePhone; @ApiModelProperty("联系人") private String contactName; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 91d1d76432..badc73c6de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -88,8 +88,8 @@ public class BaseManufacturerService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(userSid); - if (sysUserVoResultBean.getSuccess()) { - entity.setCreateOrg(sysUserVoResultBean.getData().getOrganizationSid()); - } boolean isSave = this.save(entity); if (!isSave) { return rb.setMsg("供应厂商信息保存失败"); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java index f7d744610c..704983ad2d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java @@ -79,7 +79,7 @@ public class SysStaffinfoDto implements Dto { @NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty(value = "邮箱", required = false) - @Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确") + //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确") private String email; @ApiModelProperty(value = "紧急联系人", required = false) private String emergencyContact; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java index 1c2cee23ce..fd72d1e12f 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java @@ -32,6 +32,8 @@ public class SysUserQuery implements Query { private String roleSid; @ApiModelProperty("用户名称") private String userName; + @ApiModelProperty("部门名称") + private String orgName; @ApiModelProperty("密码（加密或签名后）") private String password; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index b1733d8035..5d17c245d5 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -161,10 +161,25 @@ public class SysStaffinfoService extends MybatisBaseService records = sysStaffinfoVoIPage.getRecords(); for (SysStaffinfoVo record : records) { String orgSid = record.getOrgSid(); - SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); - SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(sysOrganization.getPsid()); - String name = sysOrganization1.getName(); - record.setOrgName(name + "-" +record.getOrgName()); + String orgName = ""; + if (StringUtils.isNotBlank(orgSid)) { + String[] split = orgSid.split(","); + for (String s : split) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s); + //从本级部门信息中获取上级sid + String psid = sysOrganization.getPsid(); + //从本级部门信息中获取本级部门名称 + String bjName = sysOrganization.getName(); + //获取上级sid获取上级部门信息 + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid); + //从上级部门信息中获取上级部门名称 + String sjName = sysOrganization1.getName(); + orgName += sjName + "-" + bjName + ","; + } + orgName = orgName.substring(0, orgName.length() - 1); + record.setOrgName(orgName); + } } return sysStaffinfoVoIPage; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index b9088f045c..28d0fe8106 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -38,7 +38,7 @@ public interface SysUserMapper extends BaseMapper { //@Update("update sys_user set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew,@Param("orgName") String orgName); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 3197409355..626c55bb78 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -48,6 +48,12 @@ LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid ${ew.sqlSegment} + + AND (SELECT GROUP_CONCAT(org.name) + FROM sys_staff_org staffOrg + LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid + WHERE staffOrg.staffSid = user.staffSid) LIKE concat('%',#{orgName},'%') + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index f44f202211..1714f2ddff 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.portal.api.sms.SmsFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; @@ -123,7 +124,6 @@ public class SysUserService extends MybatisBaseService { if (StringUtils.isNotBlank(query.getRoleSid())) { qw.eq("role.sid", query.getRoleSid()); } - return qw; } @@ -131,7 +131,30 @@ public class SysUserService extends MybatisBaseService { SysUserQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); + IPage pagging = baseMapper.selectPageVo(page, qw,query.getOrgName()); + List records = pagging.getRecords(); + for (SysUserVo record : records) { + String departmentSid = record.getDepartmentSid(); + String orgName = ""; + if (StringUtils.isNotBlank(departmentSid)) { + String[] split = departmentSid.split(","); + for (String s : split) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s); + //从本级部门信息中获取上级sid + String psid = sysOrganization.getPsid(); + //从本级部门信息中获取本级部门名称 + String bjName = sysOrganization.getName(); + //获取上级sid获取上级部门信息 + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid); + //从上级部门信息中获取上级部门名称 + String sjName = sysOrganization1.getName(); + orgName += sjName + "-" + bjName + ","; + } + orgName = orgName.substring(0, orgName.length() - 1); + record.setDepartmentName(orgName); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -204,7 +227,7 @@ public class SysUserService extends MybatisBaseService { return baseMapper.updatePassword(sid, password); } - public ResultBean updatePasswordApp(SysUser user, String oldPassword, String newPassword,String token) { + public ResultBean updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) { String oldPasswordMd5 = Encodes.md5(oldPassword); if (!oldPasswordMd5.equals(user.getPassword())) { return ResultBean.fireFail().setMsg("原始密码输入错误"); @@ -493,7 +516,7 @@ public class SysUserService extends MybatisBaseService { * @param newPwd * @return */ - public ResultBean resetPwdApp(String mobile, String newPwd,String token) { + public ResultBean resetPwdApp(String mobile, String newPwd, String token) { if (!newPwd.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); } @@ -507,7 +530,7 @@ public class SysUserService extends MybatisBaseService { } int i = baseMapper.updatePassword(user.getSid(), newPwdMd5); if (i == 1) { - if (StringUtils.isNotNull(token)){ + if (StringUtils.isNotNull(token)) { redisUtil.remove(token); } return ResultBean.fireSuccess().setMsg("修改成功");