Skip to content

[Improvement][Service] Modify ordinary users tenants#5185

Closed
zombietramp wants to merge 6 commits into
apache:devfrom
zombietramp:dev-local
Closed

[Improvement][Service] Modify ordinary users tenants#5185
zombietramp wants to merge 6 commits into
apache:devfrom
zombietramp:dev-local

Conversation

@zombietramp
Copy link
Copy Markdown

@zombietramp zombietramp commented Mar 31, 2021

1: Modify ordinary users and disable the function of selecting other tenants Scenario: After the bank's internal administrator creates a new ordinary user and assigns a tenant. No other tenants can be selected after the new process

Purpose of the pull request

Brief change log

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

2:增加流程定义sql语句不能有多条语句的提示,运行时候自动截取以;结尾的第一条语句
3:修改sql语句动态where 代替 where 1=1
4:修改template 不支持v-show命令
@chengshiwen
Copy link
Copy Markdown
Member

chengshiwen commented Mar 31, 2021

@zombietramp Please use English, and resolve the conflicts.
By the way, the v-show problem on template has been solved in pr #5145

“zombieszy@gmail.com” added 2 commits March 31, 2021 16:18
# Conflicts:
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@CalvinKirs CalvinKirs added the Waiting for user feedback Waiting for feedback from issue/PR author label Apr 1, 2021
@CalvinKirs
Copy link
Copy Markdown
Member

Thanks for your contribution. Your PR title does not seem to match the description.
Regarding multi-line SQL execution, can you describe your specific implementation?

@CalvinKirs CalvinKirs added the first time contributor First-time contributor label Apr 1, 2021
join t_ds_project p on p.id=d.project_id
where 1 = 1
and t.is_sub_process = 0
where and t.is_sub_process = 0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should remove and

@@ -0,0 +1 @@
32432423 No newline at end of file
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ignore this file

@@ -0,0 +1 @@
正正正faffdasfasdfas No newline at end of file
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ignore this file

<mapper namespace="org.apache.dolphinscheduler.dao.mapper.UserMapper">
<sql id="baseSql">
id, user_name, user_password, user_type, email, phone, tenant_id, create_time, update_time, queue, state
id, user_name, user_password, user_type, email, phone, tenant_id, create_time, update_time, queue, `state`
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the Sql style consistency, maybe it better not to make this modification ~~

import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of import * is considered a bad practice

…tenants

      Scenario: After the bank's internal administrator creates a new ordinary user and assigns a tenant. No other tenants can be selected after the new process

2: Increase the process definition sql statement can not have multiple statement prompts, the first statement ending with; is automatically intercepted when running
    If there are multiple sql after sql, run error

3: Modify sql statement dynamic where instead of where 1=1
@zombietramp zombietramp changed the title 1:修改普通用户,禁用选择其它租户的功能 [Improvement][Service] Modify ordinary users tenants Apr 5, 2021
“zombieszy@gmail.com” added 2 commits April 5, 2021 10:54
1: Modify ordinary users and disable the function of selecting other tenants       Scenario: After the bank's internal administrator creates a new ordinary user and assigns a tenant. No other tenants can be selected after the new process
@songjianet
Copy link
Copy Markdown
Member

Thank you for your contribution, but since this issue has not been dealt with for a long time, I will close it. If you still have problems in the future, you can re-submit a new issue.

@songjianet songjianet closed this Mar 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

first time contributor First-time contributor Waiting for user feedback Waiting for feedback from issue/PR author

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants