gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

更改方法名

pull/63/MERGE
Friday 2023-09-28 23:04:30 +00:00 committed by smallbun
parent 2efef4825d
commit 78cf24969d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -111,6 +111,8 @@
+ 山东爱特云翔信息技术有限公司
+ 北京中科生活服务有限公司
+ 四维世景北京(科技)有限公司
+ 抹香鲸跨境电子商务有限公司
+ 杭州天象聚合信息技术有限公司
## 微信公众号

6
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java
View File

@ -117,7 +117,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto
public List<AppGroupPO> getAppGroupList(Long userId, AppGroupQuery query) {
//@formatter:on
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId));
paramMap.put("subjectIds", getSubjectIds(userId));
//@formatter:off
StringBuilder builder = new StringBuilder("SELECT `group`.id_, `group`.name_, `group`.code_, `group`.type_, `group`.create_time, `group`.remark_, IFNULL( ass.app_count, 0) AS app_count FROM app_group `group` LEFT JOIN(SELECT aga.group_id, COUNT(DISTINCT aga.id_) AS `app_count` FROM app_group_association aga LEFT JOIN app ON aga.app_id = app.id_ AND app.is_deleted = 0 LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id and app_acce.is_deleted = 0 WHERE aga.is_deleted = 0 and (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+ "') GROUP BY aga.group_id ) ass ON `group`.id_ = ass.group_id WHERE is_deleted = '0'");
//分组名称
@ -148,7 +148,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto
public Long getAppCount(String groupId, Long userId) {
//@formatter:on
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId));
paramMap.put("subjectIds", getSubjectIds(userId));
//@formatter:off
StringBuilder builder = new StringBuilder("SELECT COUNT(DISTINCT app.id_) FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' LEFT JOIN app_group_association ass ON app.id_ = ass.app_id AND ass.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+"')");
builder.append(" AND ass.group_id = ").append(groupId);
@ -164,7 +164,7 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto
* @param userId {@link Long}
* @return {@link List}
*/
private List<Object> getAccessPolicysubjectIdsByUserId(Long userId){
private List<Object> getSubjectIds(Long userId){
//@formatter:on
List<Object> list = Lists.newArrayList();
//当前用户加入的用户组Id

6
eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java
View File

@ -66,7 +66,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
@Override
public Page<AppEntity> getAppList(Long userId, GetAppListQuery query, Pageable pageable) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId));
paramMap.put("subjectIds", getSubjectIds(userId));
//@formatter:off
StringBuilder builder = new StringBuilder("SELECT DISTINCT app.* FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' LEFT JOIN app_group_association ass ON app.id_ = ass.app_id AND ass.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"+ALL_ACCESS.getCode()+"')");
//用户名
@ -139,7 +139,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
public Long getAppCount(Long userId) {
//@formatter:on
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("subjectIds", getAccessPolicysubjectIdsByUserId(userId));
paramMap.put("subjectIds", getSubjectIds(userId));
StringBuilder builder = new StringBuilder(
"SELECT COUNT(DISTINCT app.id_) FROM app LEFT JOIN app_access_policy app_acce ON app.id_ = app_acce.app_id AND app_acce.is_deleted = '0' WHERE app.is_enabled = 1 AND app.is_deleted = '0' AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = '"
+ ALL_ACCESS.getCode() + "')");
@ -154,7 +154,7 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized {
* @param userId {@link Long}
* @return {@link List}
*/
private List<Object> getAccessPolicysubjectIdsByUserId(Long userId){
private List<Object> getSubjectIds(Long userId){
//@formatter:on
List<Object> list = Lists.newArrayList();
//当前用户加入的用户组Id