pipIrr-SV.git - Gitblit

			@@ -1,5 +1,6 @@
			package com.dy.pipIrrBase.role;

			import com.alibaba.fastjson2.JSONArray;
			import com.dy.common.aop.SsoAop;
			import com.dy.common.mybatis.envm.Deleted;
			import com.dy.common.webUtil.BaseResponse;
			@@ -62,12 +63,16 @@
			@SsoAop()
			public BaseResponse<QueryResultVo<List<VoRole>>> getRoles(QueryVo vo){
			try {
			//BaRolePermissions baRolePermissions = roleSv.getRolePermissionsById(2023122018334500002L);
			//return BaseResponseUtils.buildSuccess(baRolePermissions);

			QueryResultVo<List<VoRole>> res = roleSv.getRoles(vo);
			if(res.itemTotal != null && res.itemTotal > 0) {
			return BaseResponseUtils.buildSuccess(res);
			}else {
			return BaseResponseUtils.buildFail(SystemResultCode.NO_ROLES.getMessage());
			}

			} catch (Exception e) {
			log.error("获取开卡记录异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;
			@@ -99,7 +104,7 @@

			// 获取角色名称级权限列表
			String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
			String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
			JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
			Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);

			// 判断角色名称是否重名
			@@ -125,7 +130,7 @@
			return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());

			// 添加权限列表
			BaRolePermissions baRolePermissions = new BaRolePermissions();
			BaRolePermissions baRolePermissions = new BaRolePermissions();
			baRolePermissions.setRoleid(roleId);
			baRolePermissions.setPermissions(permissions);
			Integer rc = Optional.ofNullable(roleSv.addPermissions(baRolePermissions)).orElse(0);
			@@ -170,7 +175,8 @@

			Long roleId = Optional.ofNullable(po.getRoleid()).orElse(0L);
			String roleName = Optional.ofNullable(po.getRoleName()).orElse("");
			String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
			//String permissions = Optional.ofNullable(po.getPermissions()).orElse("");
			JSONArray permissions = Optional.ofNullable(JSONArray.parseArray(po.getPermissions())).orElse(JSONArray.parseArray("[]"));
			Long operator = Optional.ofNullable(po.getOperator()).orElse(0L);

			if(roleId == 0 && roleName.length() == 0)