From b1c4362017f88a6f145e31c06375bc3f2b676696 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:14:44 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 4 ++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2 -
company/.env.developmentCom | 6 +-
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 50 +++++++++++-------------
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 9 ++++
server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java | 6 +++
company/.env.development | 10 ++--
server/service/src/main/java/com/doumee/dao/system/SystemUserMapper.java | 3 +
8 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 4531e25..a7e4e84 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -2,13 +2,13 @@
NODE_ENV = 'development'
# 鎺ュ彛鍓嶇紑
-VUE_APP_API_PREFIX = '/yyb_admin_api'
+# VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-骞冲彴绔�'
VUE_APP_COOKIE_NAME='dmplat-auth-token'
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-# VUE_APP_API = 'http://localhost:10030/'
-# VUE_APP_API = 'http://192.168.0.135:10030/'
-# VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
+#VUE_APP_API = 'http://localhost:10030/'
+#VUE_APP_API = 'http://192.168.0.135:10030/'
+VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index b2dc706..111d872 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -6,9 +6,9 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-浼佷笟绔�'
VUE_APP_COOKIE_NAME='doumee-auth-token'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-#VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-
-VUE_APP_API = 'http://192.168.0.138:10031/'
+#VUE_APP_API = 'http://localhost:10031/'
+#VUE_APP_API = 'http://192.168.0.135:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index ddec2d9..ca292c1 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -59,10 +59,8 @@
public static final String PRIVACY ="PRIVACY";
public static final String USE ="USE";
-
public static final String GOODS_IMG_DIR ="GOODS_IMG_DIR";
public static final String CREDIT_CODE_REGEX = "[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}";
-
public static final String ROOT_PATH="ROOT_PATH";//鏈湴鏂囦欢涓婁紶鍦板潃閰嶇疆
public static final String FILE_DIR="FILE_DIR";//鏈湴鏂囦欢璁块棶鍦板潃閰嶇疆
diff --git a/server/service/src/main/java/com/doumee/dao/system/SystemUserMapper.java b/server/service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
index 12c89b8..595be00 100644
--- a/server/service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/system/SystemUserMapper.java
@@ -5,11 +5,12 @@
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserDetailVO;
import com.doumee.dao.system.vo.SystemUserListVO;
+import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
-public interface SystemUserMapper extends BaseMapper<SystemUser> {
+public interface SystemUserMapper extends MPJBaseMapper<SystemUser> {
/**
* 鏌ヨ鐢ㄦ埛鍒楄〃
diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index 53b5b32..f4bc48a 100644
--- a/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
@@ -42,6 +42,8 @@
@ApiModelProperty(value = "鎵�灞炰紒涓氱紪鐮�", example = "1", hidden = true )
private Integer companyId;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О", example = "1", hidden = true )
+ private String companyName;
@ApiModelProperty(value = "鍖哄煙缂栫爜", example = "1" )
private Integer areaId;
@@ -54,6 +56,8 @@
@ApiModelProperty(value = "鍩庡競缂栫爜", example = "1" )
private Integer cityId;
+ @ApiModelProperty(value = "閮ㄩ棬缂栫爜缂栫爜", example = "1" )
+ private Integer departmentId;
@ApiModelProperty(value = "鍩庡競缂栫爜", hidden = true)
private List<Integer> cityIds;
diff --git a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index c1528c6..198aad2 100644
--- a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -104,6 +104,15 @@
@ApiModelProperty(value = "寰俊灏忕▼搴廜PENID")
private String openid;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String departmentName;
+ @ApiModelProperty(value = "鎺堟潈浼佷笟鏁�")
+ @TableField(exist = false)
+ private Integer authNum;
@ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
@TableField(exist = false)
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
index 5dc73fd..82fc7e1 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
@@ -153,6 +153,7 @@
boolean depart=false;
boolean departAndLeaf=false;
boolean custom=false;
+ boolean self=false;
String c = "";
for(SystemDataPermissionListVO d : list){
if(!all && Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.all)){
@@ -171,6 +172,9 @@
custom =true;
c += StringUtils.defaultString(d.getCustomData(),"");
}
+ if( Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.self)){
+ self =true;
+ }
}
CompanyDepartment department = new CompanyDepartment();
department.setId(user.getDepartmentId());
@@ -185,6 +189,8 @@
if(all){
return null;
+ }else if(self){
+ return new ArrayList<>();
}else{
List<Integer> dList = new ArrayList<>();
dList.add(-1);//铏氭嫙閮ㄩ棬锛屾帓鏌ョ┖闆嗗悎
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index f93f8c0..f136847 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -10,6 +10,8 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -170,29 +172,25 @@
@Override
public PageData<SystemUserListVO> findPageCompany(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
- if (pageWrap.getModel().getRootDeptId() != null) {
-// pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
- } else {
-// List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
-// List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
-// pageWrap.getModel().setDepartmentIds(collect);
- }
- if (pageWrap.getModel().getCompanyId() == null) {
- pageWrap.getModel().setCompanyId(-1);
- }
+ IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setType(Constants.UserType.COMPANY.getKey());//鏌ヨ浼佷笟绫诲瀷
// 鎵ц鏌ヨ
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
- String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ZHUBO_ROOM_URL).getCode();
-
- for (SystemUserListVO user : userList) {
- // 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃
- user.setRoles(systemRoleService.findByUserId(user.getId()));
- // 鏌ヨ鐢ㄦ埛宀椾綅鍒楄〃
-// user.setPositions(systemPositionService.findByUserId(user.getId()));
- user.setZhuboRoomUrl(zhuboRoomUrl);
- }
- return PageData.from(new PageInfo<>(userList));
+ MPJLambdaWrapper<SystemUser> wrapper = new MPJLambdaWrapper<>();
+ wrapper .selectAll(SystemUser.class)
+ .select("(select count(distinct(a.company_id) from company_permisson a where a.user_id=t.id and a.ideleted=0 and a.type=1)",SystemUser::getAuthNum)
+ .selectAs(Company::getName,SystemUser::getCompanyName)
+ .selectAs(CompanyDepartment::getName,SystemUser::getDepartmentName)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .leftJoin(CompanyDepartment.class,CompanyDepartment::getId,SystemUser::getDepartmentId)
+ .eq( pageWrap.getModel().getDepartmentId() !=null,SystemUser::getDepartmentId, pageWrap.getModel().getDepartmentId())
+ .eq( pageWrap.getModel().getStatus() !=null,SystemUser::getStatus, pageWrap.getModel().getStatus())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getMobile()),SystemUser::getMobile, pageWrap.getModel().getMobile())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getRealname()),SystemUser::getRealname, pageWrap.getModel().getRealname())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),SystemUser::getUsername, pageWrap.getModel().getUsername())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),SystemUser::getCompanyName, pageWrap.getModel().getCompanyName());
+ IPage<SystemUserListVO> result = systemUserMapper.selectJoinPage(page,SystemUserListVO.class,wrapper);
+ return PageData.from(result);
}
@Override
@@ -261,14 +259,12 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(SystemUser.class);
queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
- queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
- .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getUsername()),
+ ms->ms.like(SystemUser::getUsername,pageWrap.getModel().getUsername())
+ .or().like(SystemUser::getMobile,pageWrap.getModel().getUsername())
.or().like(SystemUser::getRealname,pageWrap.getModel().getUsername())
);
queryWrapper.orderByDesc(SystemUser::getCreateTime);
-
-
-
IPage<SystemUser> result = systemUserJoinMapper.selectJoinPage(page, SystemUser.class, queryWrapper);
return PageData.from(result);
--
Gitblit v1.9.3