认证-参数项收集-角色添加状态权限
This commit is contained in:
+5
-1
@@ -380,7 +380,11 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
|
|||||||
public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
|
public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
|
||||||
boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
|
boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
|
||||||
if (isSuccess) {
|
if (isSuccess) {
|
||||||
return Result.OK("冻结配置成功!");
|
if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) {
|
||||||
|
return Result.OK("解冻配置成功!");
|
||||||
|
} else {
|
||||||
|
return Result.OK("冻结配置成功!");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return Result.error("冻结配置失败!");
|
return Result.error("冻结配置失败!");
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -53,13 +53,13 @@
|
|||||||
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
|
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
|
||||||
<choose>
|
<choose>
|
||||||
<when test="paramsCollectManifestEO.userTypes == 'sdt'">
|
<when test="paramsCollectManifestEO.userTypes == 'sdt'">
|
||||||
AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1'
|
AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7')
|
||||||
</when>
|
</when>
|
||||||
<when test="paramsCollectManifestEO.userTypes == 'dre'">
|
<when test="paramsCollectManifestEO.userTypes == 'dre'">
|
||||||
AND dre = #{paramsCollectManifestEO.dreForAuth}
|
AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8')
|
||||||
</when>
|
</when>
|
||||||
<when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
|
<when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
|
||||||
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state != '1'
|
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state in ('2','4','5','6','7','8')
|
||||||
</when>
|
</when>
|
||||||
<when test="paramsCollectManifestEO.userTypes == 'guest'">
|
<when test="paramsCollectManifestEO.userTypes == 'guest'">
|
||||||
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})
|
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})
|
||||||
|
|||||||
Reference in New Issue
Block a user