| company/.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| platform/.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
company/.env.development
@@ -3,4 +3,4 @@ # VUE_APP_API = 'http://192.168.0.104:10023/' VUE_APP_API = 'http://192.168.0.134:10023/' VUE_APP_API = 'http://192.168.0.104:10023/' platform/.env.development
@@ -9,7 +9,7 @@ # 焦松 #VUE_APP_API = 'http://192.168.0.36:10023' # 江萍 VUE_APP_API = 'http://192.168.0.35:10023' VUE_APP_API = 'http://192.168.0.154:10023' # #测试服务器 VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface' #VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface' server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -117,9 +117,6 @@ public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) { return ApiResponse.success(systemUserService.findPage(pageWrap)); } @ApiOperation("分页查询系统用户") @PostMapping("/findAllPage") @RequiresPermissions("system:user:query") server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -15,6 +15,7 @@ import com.doumee.service.system.SystemPermissionService; import com.doumee.service.system.SystemRoleService; import com.doumee.service.system.SystemUserService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; @@ -102,10 +103,12 @@ if(!Constants.equalsInteger(user.getStatus(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号信息已被禁用，如有疑问请联系系统管理员！"); } List<SystemRole> roles = null; List<SystemPermission> permissions =null; // 获取登录用户信息 List<SystemRole> roles = systemRoleService.findByUserId(user.getId()); List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId()); if(authenticationToken.getUserType() == 0){ roles = systemRoleService.findByUserId(user.getId()); permissions = systemPermissionService.findByUserId(user.getId()); CompanyPermission c = new CompanyPermission(); c.setUserId(user.getId()); c.setIsdeleted(Constants.ZERO); @@ -124,6 +127,18 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，企业账号信息不正确！"); } user.setCompany(company); if(StringUtils.equals(company.getUsername(),user.getUsername())){ //如果是超管， SystemRole role = new SystemRole(); role.setType(Constants.ONE); role.setDeleted(Boolean.FALSE); roles = systemRoleService.findList(role); SystemPermission p = new SystemPermission(); permissions = systemPermissionService.findList(p); }else{ roles = systemRoleService.findByUserId(user.getId()); permissions = systemPermissionService.findByUserId(user.getId()); } } LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
@@ -341,7 +341,9 @@ || StringUtils.isBlank(company.getCaptche())){ throw new BusinessException(ResponseStatus.BAD_REQUEST ); } SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche()); if(!debugModel){ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche()); } Company model = companyMapper.selectById(company.getId()); if(model == null || StringUtils.equals(model.getPhone(),company.getPhone()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"手机号未发生改变~" ); server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -25,6 +26,7 @@ import com.github.pagehelper.PageInfo; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -102,9 +104,16 @@ @Override public SystemUser findById(Integer id) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(SystemUser.class); queryWrapper.eq(SystemUser::getId,id ); queryWrapper.eq(SystemUser::getType,loginUserInfo.getType() ); if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ //如果是企业账号 queryWrapper.eq(SystemUser::getCompanyId,loginUserInfo.getCompanyId() ); } queryWrapper.orderByDesc(SystemUser::getCreateTime); SystemUser result = systemUserJoinMapper.selectJoinOne( SystemUser.class, queryWrapper); return result; @@ -118,6 +127,12 @@ @Override public List<SystemUser> findList(SystemUser systemUser) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); systemUser.setType(loginUserInfo.getType()); if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ //如果是企业账号 systemUser.setCompanyId(loginUserInfo.getCompanyId()); } Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser); return systemUserMapper.selectList(wrapper); } @@ -131,6 +146,12 @@ // List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>()); // List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList()); // pageWrap.getModel().setDepartmentIds(collect); } LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); pageWrap.getModel().setType(loginUserInfo.getType()); if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ //如果是企业账号 pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId()); } // 执行查询 PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity()); @@ -202,7 +223,12 @@ @Override public PageData<SystemUser> findAllList(PageWrap<SystemUser> pageWrap) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); pageWrap.getModel().setType(loginUserInfo.getType()); if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ //如果是企业账号 pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId()); } IPage<SystemUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); @@ -224,6 +250,12 @@ @Override public List<SystemUser> findAllList(SystemUser pageWrap){ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); pageWrap.setType(loginUserInfo.getType()); if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ //如果是企业账号 pageWrap.setCompanyId(loginUserInfo.getCompanyId()); } MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(SystemUser.class);
