open_platform/ss-common-user
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
God
2024-07-11 14:58:35 +08:00
parent 7eb690c96f 13c24743ea
commit b2f8d8105e
33 changed files with 220 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
View File

@@ -1,8 +1,11 @@
package com.yxt.portal.apiadmin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yxt.portal.biz.sysmenu.*;
//import com.yxt.user.biz.sysmenurole.SysMenuRoleQuery;
import com.yxt.portal.biz.sysorganization.SysOrganization;
import com.yxt.portal.biz.sysorganization.SysOrganizationService;
import com.yxt.portal.biz.sysrole.SysRole;
import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorizeQuery;
import com.yxt.portal.biz.sysroleauthorize.SysRoleAuthorizeService;
@@ -64,6 +67,8 @@ public class SysMenuRest {
private SysRoleService sysRoleService;
@Autowired
SysRoleAuthorizeService sysRoleAuthorizeService;
@Autowired
SysOrganizationService sysOrganizationService;
@ApiOperation("根据条件分页查询数据的列表")
@@ -167,10 +172,19 @@ public class SysMenuRest {
List<Map<String, Object>> list = new ArrayList<>();
if (null == query)
return rb.setData(list);
SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",query.getOrgSid()));
String a="";
if(!sysOrganization.getPsid().equals("0")){
a =sysOrganization.getOrgSidPath().substring(0,sysOrganization.getOrgSidPath().lastIndexOf("/"));
}else{
a=sysOrganization.getOrgSidPath();
}
//根据用户和资源查询 这个资源下的菜单
List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), query.getOrgSid(),query.getSourceSid());
List<SysUserRoleVo> userRole = sysUserRoleService.selectByUserSid(query.getUserSid(), a,"");
List<String> roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList());
if(userRole.size()==0){
return rb.success().setData(new ArrayList<>());
}
for (String roleSid : roleSids) {
SysRole sysRole = sysRoleService.fetchBySid(roleSid);
if(sysRole == null){
@@ -198,7 +212,7 @@ public class SysMenuRest {
ResultBean<List<SysMenuVo>> resultBean = new ResultBean<List<SysMenuVo>>();
return resultBean.fail().setMessage("角色sid不能为空!");
}
List<SysSourceVo> sysSourceVos = sysSourceService.listVo();
List<SysSourceVo> sysSourceVos = sysSourceService.listVo(query.getSourceSid());
List<SysMenuVo> list = new ArrayList<>();
for (SysSourceVo s : sysSourceVos) {
SysMenuVo sysMenuVo = new SysMenuVo();
@@ -229,7 +243,7 @@ public class SysMenuRest {
if (sysSource == null) {
return rb.setMsg("资源不存在");
}
dto.setMenuType("0");
// dto.setMenuType("0");
sysMenuService.saveMenu(dto);
return rb.success();
}
@@ -245,7 +259,7 @@ public class SysMenuRest {
}
String sourceSid = dto.getSourceSid();
dto.setMenuType("0");
// dto.setMenuType("0");
sysMenuService.updateBySid(dto, sid);
return rb.success();
}

21
src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java
View File

@@ -41,7 +41,7 @@ import static java.util.stream.Collectors.toList;
*/
@Api(tags = "组织机构表")
@RestController
@RequestMapping("apiadmin/sysorganization")
@RequestMapping("/apiadmin/sysorganization")
public class SysOrganizationRest{
@Autowired
@@ -84,10 +84,10 @@ public class SysOrganizationRest{
}
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SysOrganizationVo>> list() {
@GetMapping("/list/{orgSid}")
public ResultBean<List<SysOrganizationVo>> list(@PathVariable("orgSid") String orgSid) {
ResultBean rb = ResultBean.fireFail();
List<SysOrganizationVo> list = sysOrganizationService.listVo();
List<SysOrganizationVo> list = sysOrganizationService.listVo(orgSid);
return rb.success().setData(list);
}
@@ -113,7 +113,9 @@ public class SysOrganizationRest{
@Transactional(rollbackFor = Exception.class)
public ResultBean update(SysOrganizationDto dto, String sid){
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
//查询该机构下的所有分管人员
List<String> stringList = sysStaffOrgService.selectByOrgSid(sid);
@@ -137,19 +139,19 @@ public class SysOrganizationRest{
}
//删除关联关系中的所有主管与分管的人员关系
sysStaffOrgService.delZGAndFGByOrgSid(sid);
/*if (StringUtils.isNotBlank(zgStaffSid)) {
if (StringUtils.isNotBlank(zgStaffSid)) {
ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
}*/
}
if (StringUtils.isNotBlank(fgStaffSid)) {
ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
}
sysOrganizationService.updateBySid(dto.toMap(), sid);
sysOrganizationService.updateBySid(dto, sid);
//修改金蝶组织信息
//==========================添加清空变化的用户的token
//查询分管人员
@@ -209,6 +211,9 @@ public class SysOrganizationRest{
}
String[] sidArr = sid.split(",");
sysOrganizationService.delBySids(sidArr);
for (String s : sidArr) {
sysStaffOrgService.delByOrgSid(s);
}
return rb.success();
}

2
src/main/java/com/yxt/portal/apiadmin/SysPostRest.java
View File

@@ -72,7 +72,7 @@ public class SysPostRest {
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
sysPostService.updateBySid(dto.toMap(), sid);
sysPostService.updateBySid(dto, sid);
return rb.success();
}

2
src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java
View File

@@ -81,7 +81,7 @@ public class SysSourceRest {
public ResultBean<List<SysSourceVo>> list(){
ResultBean rb = ResultBean.fireFail();
List<SysSourceVo> list = sysSourceService.listVo();
List<SysSourceVo> list = sysSourceService.listVo("");
return rb.success().setData(list);
}

4
src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java
View File

@@ -76,7 +76,7 @@ public class SysStaffinfoRest{
*/
@ApiOperation("新增保存")
@PostMapping("/save")
public ResultBean save(SysStaffinfoDto dto) {
public ResultBean save(@RequestBody SysStaffinfoDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = sysStaffinfoService.saveStaffInfo(dto);
if (!resultBean.getSuccess()) {
@@ -94,7 +94,7 @@ public class SysStaffinfoRest{
*/
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(SysStaffinfoDto dto, String sid) {
public ResultBean update(@RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = sysStaffinfoService.updateStaffInfo(dto, sid);
if (!resultBean.getSuccess()) {

36
src/main/java/com/yxt/portal/apiadmin/SysUserRest.java
View File

@@ -413,6 +413,9 @@ public class SysUserRest {
return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
}
}
if(user.getAccountType().equals("3")){
return new ResultBean<SysUserVo>().fail().setMsg("此账号不能登录");
}
}else{
//验证码登录
if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
@@ -428,6 +431,9 @@ public class SysUserRest {
} else {
return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效，请重新获取");
}
if(user.getAccountType().equals("3")){
return new ResultBean<SysUserVo>().fail().setMsg("此账号不能登录");
}
}
// 根据用户信息查询用户的角色信息
List<SysStaffOrgVo>sysStaffOrgVos= sysStaffOrgService.fetchOrgsByStaffSid(user.getStaffSid());
@@ -457,6 +463,7 @@ public class SysUserRest {
SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(sysUser);
userInfoOneVo.setOrgSid(dto.getOrgSid());
userInfoOneVo.setOrgName(userInfoOneVo.getOrganizationName());
sysUserService.updateToken(sysUser.getSid(),userInfoOneVo.getToken());
return new ResultBean<>().success().setData(userInfoOneVo);
}
@PostMapping("/register")
@@ -469,7 +476,7 @@ public class SysUserRest {
//手机号
String mobile = dto.getMobile();
//姓名
String name = dto.getName();
String name = dto.getCompanyName();
//验证码
String verificationCode = dto.getCode();
@@ -520,7 +527,7 @@ public class SysUserRest {
su.setPassword(md5);
su.setIsAdmin("1");
sysUserService.save(su);
ssi.setName(name);
ssi.setName(name+"系统管理员");
ssi.setMobile(mobile);
sysStaffinfoService.save(ssi);
ssSid=ssi.getSid();
@@ -538,6 +545,7 @@ public class SysUserRest {
SysOrganization sysOrg=new SysOrganization();
sysOrg.setName(dto.getCompanyName());
sysOrg.setLinkPhone(dto.getContacts());
sysOrg.setOrgSidPath(sysOrg.getSid());
sysOrganizationService.save(sysOrg);
SysStaffOrg sysStaffOrg=new SysStaffOrg();
@@ -547,25 +555,25 @@ public class SysUserRest {
sysStaffOrg.setManageType("3");
sysStaffOrgService.save(sysStaffOrg);
// SysRole sysRole=new SysRole();
// sysRole.setCode("");
// sysRole.setName("单位管理员");
// sysRole.setSort(0);
// sysRole.setType(1);
// sysRole.setOrgSid(sysOrg.getSid());
// sysRoleService.save(sysRole);
SysRole sysRole=new SysRole();
sysRole.setCode("");
sysRole.setName("系统管理员");
sysRole.setSort(0);
sysRole.setType(1);
sysRole.setOrgSid(sysOrg.getSid());
sysRoleService.save(sysRole);
//
// SysUserRole sysUserRole=new SysUserRole();
// sysUserRole.setRoleSid(sysRole.getSid());
// sysUserRole.setUserSid(sysUser.getSid());
// sysUserRoleService.save(sysUserRole);
SysUserRole sysUserRole=new SysUserRole();
sysUserRole.setRoleSid(sysRole.getSid());
sysUserRole.setUserSid(sysUser.getSid());
sysUserRoleService.save(sysUserRole);
SysUser user = null;
user = sysUserService.selectByUserName(sysUser.getUserName());
user.setOrgSid(sysOrg.getSid());
SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
userInfoOneVo.setOrgSid(sysOrg.getSid());
userInfoOneVo.setOrgName(sysOrg.getName());
sysUserService.updateToken(sysUser.getSid(),userInfoOneVo.getToken());
return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
}
@PostMapping("/loginByNoVeriCode")

4
src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
View File

@@ -79,7 +79,9 @@
menu.pageUrlRedirect AS pageUrlRedirect,
menu.pageUrl AS pageUrl,
menu.remarks,
menu.isEnable
menu.isEnable,
menu.menuType,
menu.isShow
FROM sys_menu menu
LEFT JOIN sys_source source ON menu.sourceSid = source.sid
WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1

2
src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
View File

@@ -128,7 +128,7 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
}*/
public List<SysMenuTreeVo> listAllVoForSource(SysMenuQuery query) {
//查询所有的资源列表
List<SysMenuTreeVo> sysSourceVos = sysSourceService.listMenuTreeVo();
List<SysMenuTreeVo> sysSourceVos = sysSourceService.listMenuTreeVo(query.getSourceSid());
for (SysMenuTreeVo s : sysSourceVos) {
//根据资源sid查询该资源下的所有一级菜单
//List<SysMenuTreeVo> sysMenuVoList = sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid());

2
src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java
View File

@@ -54,6 +54,8 @@ public class SysMenuTreeVo implements Vo {
private String isEnable;
@ApiModelProperty(value = "备注")
private String remarks;
private String menuType;
private String isShow;
@ApiModelProperty("子菜单")
private List<SysMenuTreeVo> children;
}

2
src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java
View File

@@ -35,7 +35,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
List<SysOrganizationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysOrganization> qw);
List<SysOrganizationVo> selectFirstOrgList();
List<SysOrganizationVo> selectFirstOrgList(@Param("orgSid")String orgSid);
List<SysOrganizationVo> selectChildrenListByPsid(@Param("psid") String psid);

3
src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml
View File

@@ -45,6 +45,9 @@
SELECT sid, name, psid, orgCode
FROM sys_organization
WHERE psid = '0'
<if test="orgSid!=null and orgSid!=''">
and sid=#{orgSid}
</if>
</select>
<select id="selectChildrenListByPsid" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">

6
src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java
View File

@@ -145,8 +145,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
return baseMapper.selectListAllVo(qw);
}
public List<SysOrganizationVo> listVo() {
List<SysOrganizationVo> sysOrganizations = baseMapper.selectFirstOrgList();
public List<SysOrganizationVo> listVo(String orgSid) {
List<SysOrganizationVo> sysOrganizations = baseMapper.selectFirstOrgList(orgSid);
getChildList(sysOrganizations);
return sysOrganizations;
}
@@ -162,7 +162,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
}
public List<SysOrganizationVo> selectFirstOrgList() {
return baseMapper.selectFirstOrgList();
return baseMapper.selectFirstOrgList("");
}
public List<SysOrganizationVo> selectChildrenListBySid(String sid) {

10
src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.xml
View File

@@ -6,17 +6,17 @@
<select id="selectPageVo" resultType="com.yxt.portal.biz.syspost.SysPostVo">
SELECT post.sid sid,
post.name name,
post.orgSid,
-- post.orgSid,
post.postCode,
post.postLevelKey,
post.postLevel,
post.orgSid,
IF(org.psid = '0', org.name,
CONCAT((select name from sys_organization where sid = org.psid), "/", org.name)) orgName,
-- post.orgSid,
-- IF(org.psid = '0', org.name,
-- CONCAT((select name from sys_organization where sid = org.psid), "/", org.name)) orgName,
post.parentSid,
sp.name parentName
FROM sys_post post
left join sys_organization org on org.sid = post.orgSid
-- left join sys_organization org on org.sid = post.orgSid
left join sys_post sp on post.parentSid = sp.sid
<where>
${ew.sqlSegment}

6
src/main/java/com/yxt/portal/biz/syspost/SysPostService.java
View File

@@ -57,9 +57,9 @@ public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
qw.like("post.name", query.getName());
}
if (StringUtils.isNotBlank(query.getOrgSid())) {
qw.eq("post.orgSid", query.getOrgSid());
}
// if (StringUtils.isNotBlank(query.getOrgSid())) {
// qw.eq("post.orgSid", query.getOrgSid());
// }
return qw;
}

1
src/main/java/com/yxt/portal/biz/sysrole/SysRoleDto.java
View File

@@ -50,4 +50,5 @@ public class SysRoleDto implements Dto {
private String roleTypeValue;
@ApiModelProperty(value = "组织")
private String orgSid;
private String dataRuleId;
}

16
src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml
View File

@@ -4,7 +4,19 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">
SELECT sr.*, sp.sid as postSid, sp.name as postName
SELECT sr.*, sp.sid as postSid, sp.name as postName,
CASE
dataRuleId
WHEN 1 THEN
'全部数据'
WHEN 2 THEN
'部门及子部门数据'
WHEN 3 THEN
'本部门数据'
WHEN 4 THEN
'本人数据'
END
AS dataRuleValue
FROM sys_role sr
LEFT JOIN sys_post sp ON sr.postSid = sp.sid
<where>
@@ -24,7 +36,7 @@
SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
FROM sys_role role
LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
AND userRole.userSid = #{param1}
AND userRole.userSid = #{param1} and isEnable="1"
</select>
<select id="fetchByUserSid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">

1
src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java
View File

@@ -68,6 +68,7 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
if (query.getType() != null) {
qw.eq("sr.type", query.getType());
}
qw.eq("sr.isEnable","1");
return qw;
}

6
src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.java
View File

@@ -35,8 +35,8 @@ public interface SysSourceMapper extends BaseMapper<SysSource> {
List<SysSourceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysSource> qw);
@Select("select * from sys_source")
List<SysSourceVo> selectListVo();
@Select("select * from sys_source where sid=#{sourceSid}")
List<SysSourceVo> selectListVo(@Param("sourceSid") String sourceSid);
@Select("select * from sys_source where sid=#{sid}")
SysSource fetchBySidVo(@Param("sid") String sid);
@@ -48,7 +48,7 @@ public interface SysSourceMapper extends BaseMapper<SysSource> {
*
* @return
*/
List<SysMenuTreeVo> listMenuTreeVo();
List<SysMenuTreeVo> listMenuTreeVo(String sourceSid);
List<SysFunctionTreeVo> listFunctionTreeVo(String name);
}

1
src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.xml
View File

@@ -41,5 +41,6 @@
<!--菜单sid-->
sid as sid
from sys_source
where sid=#{sourceSid}
</select>
</mapper>

8
src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java
View File

@@ -127,8 +127,8 @@ public class SysSourceService extends MybatisBaseService<SysSourceMapper, SysSou
return baseMapper.selectListAllVo(qw);
}
public List<SysSourceVo> listVo() {
return baseMapper.selectListVo();
public List<SysSourceVo> listVo(String sourceSid) {
return baseMapper.selectListVo(sourceSid);
}
public void saveOrUpdateDto(SysSourceDto dto){
@@ -160,8 +160,8 @@ public class SysSourceService extends MybatisBaseService<SysSourceMapper, SysSou
*
* @return
*/
public List<SysMenuTreeVo> listMenuTreeVo() {
return baseMapper.listMenuTreeVo();
public List<SysMenuTreeVo> listMenuTreeVo(String sourceSid) {
return baseMapper.listMenuTreeVo(sourceSid);
}
public List<SysFunctionTreeVo> listFunctionTreeVo(String name) {

2
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDetailsVo.java
View File

@@ -79,4 +79,6 @@ public class SysStaffinfoDetailsVo implements Vo {
private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
private String userType;//用户类型:1员工、2客户、3供应商
private List<SysRoleVo> sysRoleVos;//
private String userName;
private String remarks;
}

7
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDto.java
View File

@@ -187,6 +187,11 @@ public class SysStaffinfoDto implements Dto {
@ApiModelProperty(value = "离职原因")
private String quitReason;
private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
private String userType;//用户类型:1员工、2客户、3供应商
private Integer userType;//用户类型:1员工、2客户、3供应商
private String orgSid;
// @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确")
@Pattern(regexp = "^[0-9]{11}$", message = "账号格式不正确")
@NotBlank(message = "账号不能为空")
private String userName;
private String remarks;
}

26
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
View File

@@ -181,31 +181,7 @@
<!--银行卡号-->
bankCardNo,
<!--开户行-->
openBank,
<!--身份证(人像面)-->
IF(idCardA = "", idCardA, CONCAT(#{path}, idCardA)) AS idCardA,
<!--NULLIF(idCardA,CONCAT(#{path}, idCardA) as idCardA),-->
<!--when idCardA is null then idCardA else concat(#{path}, idCardA) as idCardA end,-->
<!--身份证(国徽面)-->
IF(idCardB = "", idCardB, CONCAT(#{path}, idCardB)) AS idCardB,
<!--NULLIF(idCardB,concat(#{path}, idCardB) as idCardB),-->
<!--when idCardB is null then idCardB else concat(#{path}, idCardB) as idCardB end,-->
<!--学历证书-->
IF(diploma = "", diploma, CONCAT(#{path}, diploma)) AS diploma,
<!--NULLIF(CONCAT(#{path}, diploma) as diploma,diploma),-->
<!--when diploma is null then diploma else concat(#{path}, diploma) as diploma end,-->
<!--学位证书-->
IF(degreeCertificate = "", degreeCertificate, CONCAT(#{path}, degreeCertificate)) AS degreeCertificate,
<!--NULLIF(CONCAT(#{path}, degreeCertificate) as degreeCertificate,degreeCertificate),-->
<!--when degreeCertificate is null then degreeCertificate else concat(#{path}, degreeCertificate) as degreeCertificate end,-->
<!--前公司离职证明-->
IF(leaveCertificate = "", leaveCertificate, CONCAT(#{path}, leaveCertificate)) AS leaveCertificate,
<!--NULLIF(CONCAT(#{path}, leaveCertificate) as leaveCertificate,leaveCertificate),-->
<!--when leaveCertificate is null then leaveCertificate else concat(#{path}, leaveCertificate) as leaveCertificate end,-->
<!--员工照片-->
IF(photo = "", photo, CONCAT(#{path}, photo)) AS photo
<!--NULLIF(CONCAT(#{path}, photo) as photo,photo),-->
<!--when photo is null then photo else concat(#{path}, photo) as photo end,-->
openBank
from sys_staffinfo
where sid = #{sid}
</select>

88
src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java
View File

@@ -38,6 +38,7 @@ import com.yxt.portal.biz.sysuserrole.SysUserRoleVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -432,11 +433,13 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
return rb.success().setMsg("添加员工信息成功");
}
@Transactional
public ResultBean saveStaffInfo(SysStaffinfoDto dto) {
ResultBean rb = ResultBean.fireFail();
//员工类型
//String personTypeKey = dto.getPersonTypeKey();
String jobNumber = "";
dto.setMobile(dto.getUserName());
SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber();
if (sysStaffinfo == null) {
//无此员工类型的员工
@@ -459,6 +462,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
//添加员工基础信息
SysStaffinfo sysStaffinfo3 = new SysStaffinfo();
dto.fillEntity(sysStaffinfo3);
sysStaffinfo3.setIdNo("0");
sysStaffinfo3.setBankCardNo("0");
sysStaffinfo3.setJobNumber(jobNumber);
//增加员工的关联的部门信息
@@ -469,19 +474,20 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
sysStaffOrgDto.fillEntity(sysStaffOrg);
sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
sysStaffOrg.setManageType("3");
sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
sysStaffOrgService.save(sysStaffOrg);
save(sysStaffinfo3);
//添加用户信息
SysUser sysUser = new SysUser();
sysUser.setStaffSid(sysStaffinfo3.getSid());
sysUser.setUserName(jobNumber);
sysUser.setUserName(dto.getMobile());
sysUser.setMobile(sysStaffinfo3.getMobile());
sysUser.setUserType(1);
sysUser.setUserType(dto.getUserType());
String password = sysStaffinfo3.getMobile().substring(5, 11);
String md5 = Encodes.md5(password);
sysUser.setPassword(md5);
sysUser.setAccountType(dto.getAccountType());
sysUser.setRemarks(dto.getRemarks());
boolean isSave = sysUserService.save(sysUser);
if (!isSave) {
return rb.setMsg("添加员工信息失败");
@@ -634,7 +640,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
}
//更新用户信息
sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
// sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
SysUser s =sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
//更新员工的关联的部门信息
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
// int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2");
@@ -734,38 +741,35 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
sysStaffinfo.setJobNumber(dto.getJobNumber());
//更新用户信息
sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
// sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
sysUser.setAccountType(dto.getAccountType());
sysUser.setUserType(dto.getUserType());
sysUser.setRemarks(dto.getRemarks());
sysUser.setUserName(dto.getUserName());
boolean isUpdate1=sysUserService.update(sysUser,new QueryWrapper<SysUser>().eq("sid",sysUser.getSid()));
if (!isUpdate1) {
return rb.setMsg("更新信息失败");
}
//更新员工的关联的部门信息
SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
// int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2");
// if (count > 0) {
// sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2");
// }
// SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath());
// if(sysStaffOrg == null){
// ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
// sysStaffOrg = staffOrgResultBean.getData();
// if(sysStaffOrg == null){
// sysStaffOrg = new SysStaffOrg();
// sysStaffOrg.setStaffSid(sid);
// BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
// sysStaffOrg.setManageType("3");
// sysStaffOrgService.insert(sysStaffOrg);
// }else{
// BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
// sysStaffOrg.setManageType("3");
// sysStaffOrgService.updateById(sysStaffOrg);
// }
// }else{
// BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
// sysStaffOrg.setManageType("3");
// sysStaffOrgService.updateById(sysStaffOrg);
// }
SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidn(sid);
BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
sysStaffOrgService.updateById(sysStaffOrg);
boolean isUpdate = updateById(sysStaffinfo);
if (!isUpdate) {
return rb.setMsg("更新员工信息失败");
}
List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
//角色
sysUserRoleService.deleteByUserSid(sysUser.getSid());
for (SysUserRoleDto sysUserRole : dto.getSysUserRoles()) {
SysUserRole ss = new SysUserRole();
ss.setUserSid(sysUser.getSid());
ss.setRoleSid(sysUserRole.getRoleSid());
sysUserRoleService.save(ss);
}
List<String> orgList1 = new ArrayList<>();
if (sysStaffOrgVos1.size() > 0) {
for (SysStaffOrgVo vv : sysStaffOrgVos1) {
@@ -783,8 +787,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
if (reduce1.size() > 0) {
//根据staffSid查询token
String token = sysUserService.selectByStaffsid(sid).getToken();
//清空该token
redisUtil.remove(token);
if(StringUtils.isNotBlank(token)){
//清空该token
redisUtil.remove(token);
}
}
return rb.success().setMsg("更新员工信息成功");
}
@@ -796,9 +802,15 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
*/
public SysStaffinfoDetailsVo selectDetailsBySid(String sid) {
String path = fileUploadComponent.getUrlPrefix();
SysStaffinfoDetailsVo sysStaffinfoDetailsVo = baseMapper.selectDetailsBySid(sid, path);
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid",sid));
SysStaffinfoDetailsVo sysStaffinfoDetailsVo = baseMapper.selectDetailsBySid(sysUser.getStaffSid(), path);
sysStaffinfoDetailsVo.setUserName(sysUser.getUserName());
sysStaffinfoDetailsVo.setRemarks(sysUser.getRemarks());
sysStaffinfoDetailsVo.setAccountType(sysUser.getAccountType());
sysStaffinfoDetailsVo.setUserType(sysUser.getUserType().toString());
sysStaffinfoDetailsVo.setRemarks(sysUser.getRemarks());
if (sysStaffinfoDetailsVo != null) {
List<SysStaffOrg> sysStaffOrgList = sysStaffOrgService.getOrgByStaffSidList(sid);
List<SysStaffOrg> sysStaffOrgList = sysStaffOrgService.getOrgByStaffSidList(sysUser.getStaffSid());
String orgSid = "";
String type = "";
for (SysStaffOrg s : sysStaffOrgList) {
@@ -816,9 +828,9 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
}
// SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sid, orgSid, type);
SysUser s= sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sysStaffinfoDetailsVo.getSid()));
List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(s.getSid());
SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sysUser.getStaffSid(), orgSid, type);
List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(sysUser.getSid());
sysStaffinfoDetailsVo.setSysUserRoles(list);
// SysStaffPostDetailsVo sysStaffPostDetailsVo = sysStaffPostService.selectByStaff(sid, staffPostDetailsVo.getPostSid());
if(sysStaffOrgDetailsVo != null){
@@ -889,7 +901,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
qw.eq("ss.isDelete", 0);
qw.ne("sso.orgSid", deptSid);
qw.ne("ss.personTypeKey","01");
// qw.ne("ss.personTypeKey","01");
return baseMapper.getStaffName(qw);
}
@@ -900,7 +912,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
qw.eq("sso.orgSid", deptSid);
qw.eq("ss.isDelete", 0);
qw.ne("ss.personTypeKey","01");
// qw.ne("ss.personTypeKey","01");
return baseMapper.getStaffNameByDeptSid(qw);
}

3
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java
View File

@@ -88,7 +88,8 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
@Select("select * from sys_staff_org where staffSid=#{sid} and orgSidPath = #{path} ")
SysStaffOrg getOrgByStaffSidAndPath(@Param("sid") String sid, @Param("path") String path);
@Select("select * from sys_staff_org where staffSid=#{sid} ")
SysStaffOrg getOrgByStaffSidn(@Param("sid") String sid);
@Select("select * from sys_staff_org where staffSid=#{sid}")
List<SysStaffOrg> getOrgByStaffSidList(String sid);

13
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml
View File

@@ -83,17 +83,20 @@
<select id="selectByStaffAndOrg" resultType="int">
select count(*)
from sys_staff_org sso
left join sys_organization org on org.sid=sso.orgSid
where sso.staffSid = #{staffSid}
and sso.manageType = #{type}
and orgSidPath = #{sid}
and org.orgSidPath = #{sid}
</select>
<delete id="deleteByStaffSidAndType">
delete
delete sys_staff_org
from sys_staff_org
where staffSid = #{staffSid}
and manageType = #{type}
and orgSidPath = #{sid}
LEFT JOIN sys_organization on sys_organization.sid = sys_staff_org.orgSid
where sys_staff_org.staffSid = #{staffSid}
and sys_staff_org.manageType = #{type}
and sys_organization.orgSidPath = #{sid}
</delete>
<select id="selectByStaffS" resultType="com.yxt.portal.biz.sysstafforg.SysStaffOrgVo">

3
src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java
View File

@@ -227,6 +227,9 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
public SysStaffOrg getOrgByStaffSidAndPath(String sid, String path) {
return baseMapper.getOrgByStaffSidAndPath(sid, path);
}
public SysStaffOrg getOrgByStaffSidn(String sid) {
return baseMapper.getOrgByStaffSidn(sid);
}
public List<SysStaffOrg> getOrgByStaffSidList(String sid) {
return baseMapper.getOrgByStaffSidList(sid);

3
src/main/java/com/yxt/portal/biz/sysuser/SysUser.java
View File

@@ -68,5 +68,6 @@ public class SysUser extends BaseEntity {
private String headImage;
@TableField(exist = false)
private String orgSid;
private String accountType;////账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
private String accountType;////账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户‘
}

8
src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml
View File

@@ -5,6 +5,9 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.portal.biz.sysuser.SysUserVo">
SELECT DISTINCT user.staffSid,
user.userType,
user.accountType,
user.createTime,
user.isEnable,
(
SELECT GROUP_CONCAT(org.name)
@@ -38,9 +41,8 @@
FROM sys_user_role user_role
LEFT JOIN sys_role role ON role.sid = user_role.roleSid
WHERE user_role.userSid = USER.sid
) roleName,
) roleName
-- dict.dictValue userType,
user.userType userTypeKey
FROM sys_user USER
LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
LEFT JOIN sys_role role ON role.sid = user_role.roleSid
@@ -48,6 +50,8 @@
LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
left join sys_staff_org a on a.staffSid=staff.sid
left join sys_org_authorize b on b.orgSid=a.orgSid
left join sys_organization c on c.sid=a.orgSid
<where>
${ew.sqlSegment}
<if test="orgName != null and orgName != ''">

34
src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java
View File

@@ -35,6 +35,7 @@ import com.yxt.common.base.utils.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.portal.biz.sysuserrole.SysUserRoleVo;
import com.yxt.portal.config.DictCommonType;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
@@ -133,8 +134,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
if (StringUtils.isNotBlank(query.getRoleSid())) {
qw.eq("role.sid", query.getRoleSid());
}
qw.eq("a.orgSid",query.getOrgSid());
qw.eq("b.sourceSid",query.getSourceSid());
qw.ne("USER.isDelete","1");
qw.like("c.orgSidPath",query.getOrgSid());
// qw.eq("b.sourceSid",query.getSourceSid());
// if (StringUtils.isNotBlank(query.getName())) {
// qw.like("staff.name", query.getName());
// }
@@ -160,6 +162,30 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
List<SysUserVo> records = pagging.getRecords();
for (SysUserVo record : records) {
record.setSysRoleVos(sysUserRoleService.selByUserSid(record.getSid()));
for (SysUserRoleVo sysRoleVo : record.getSysRoleVos()) {
if(StringUtils.isBlank(record.getRoles())){
record.setRoles(sysRoleVo.getName());
}else{
record.setRoles(record.getRoles()+","+sysRoleVo.getName());
}
}
if(record.getUserType().equals("1")){
record.setUserTypeValue("员工");
}else if(record.getUserType().equals("2")){
record.setUserTypeValue("客户");
} else if(record.getUserType().equals("3")){
record.setUserTypeValue("供应商");
}
if(record.getAccountType().equals("0")){
record.setAccountTypeValue("平台管理员");
}else if(record.getAccountType().equals("1")){
record.setAccountTypeValue("单位管理员");
} else if(record.getAccountType().equals("2")){
record.setAccountTypeValue("操作员");
}else if(record.getAccountType().equals("3")){
record.setAccountTypeValue("非登录账户 ");
}
String departmentSid = record.getDepartmentSid();
String orgName = "";
if (StringUtils.isNotBlank(departmentSid)) {
@@ -750,7 +776,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
}
public void delBySid(String sid) {
baseMapper.delBySid(sid);
SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("sid",sid));
sysUser.setIsDelete(1);
baseMapper.update(sysUser,new QueryWrapper<SysUser>().eq("sid",sid));
}
/**

5
src/main/java/com/yxt/portal/biz/sysuser/SysUserVo.java
View File

@@ -78,7 +78,7 @@ public class SysUserVo implements Vo {
@ApiModelProperty("用户类型:1员工、2客户、3供应商")
private String userType;
@ApiModelProperty("用户类型:1、2、3")
private String userTypeKey;
private String userTypeValue;
@ApiModelProperty("用户头像")
private String headImage;
@ApiModelProperty("组织名称")
@@ -110,4 +110,7 @@ public class SysUserVo implements Vo {
private List<SysUserRoleVo> sysRoleVos;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
private String roles;//角色 ,分割
private String accountType;
private String accountTypeValue;
}

2
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml
View File

@@ -24,7 +24,7 @@
</if>
</select>
<select id="selByUserSid" resultType="com.yxt.portal.biz.sysuserrole.SysUserRoleVo">
SELECT a.*,b.name as roleName
SELECT a.*,b.name as name
FROM sys_user_role a
left join sys_role b on b.sid =a.roleSid
WHERE a.userSid = #{userSid}

2
src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleVo.java
View File

@@ -29,5 +29,5 @@ public class SysUserRoleVo implements Vo {
@ApiModelProperty("角色sid")
private String roleSid;
private String roleName;
private String name;
}