|
|
@@ -12,8 +12,8 @@ import com.dragoninfo.dcuc.auth.auth.vo.DataAuthAcceptVo;
|
|
|
import com.dragoninfo.dcuc.auth.auth.vo.DataAuthTreeReactVo;
|
|
|
import com.dragoninfo.dcuc.auth.sub.dto.LabelSearchDTO;
|
|
|
import com.dragoninfo.dcuc.auth.sub.facade.IUserCenterApiFacade;
|
|
|
-import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data.*;
|
|
|
import com.dragoninfo.dcuc.auth.sub.vo.LabelTreeVO;
|
|
|
+import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.data.*;
|
|
|
import com.dragoninfo.dcuc.authweb.util.VersionUtils;
|
|
|
import com.dragoninfo.duceap.core.response.Result;
|
|
|
import com.dragonsoft.duceap.base.entity.search.SearchDTO;
|
|
|
@@ -40,8 +40,6 @@ import java.util.stream.Collectors;
|
|
|
@RequestMapping("authsvr/"+ VersionUtils.VERSION_UID +"/dataauth")
|
|
|
public class DataAuthController {
|
|
|
|
|
|
- public static final String idJoin = "|";
|
|
|
-
|
|
|
@Autowired
|
|
|
IDataAuthFacade dataAuthFacade;
|
|
|
|
|
|
@@ -204,7 +202,7 @@ public class DataAuthController {
|
|
|
List<SubDataVo> dataVoList = tickedDatas.stream()
|
|
|
.map(dto->{
|
|
|
//拼接dataId给前端使用,保证dataId是唯一值
|
|
|
- dto.setDataId(dto.getClassifyCode()+ idJoin + dto.getDataId());
|
|
|
+ dto.setDataId(dto.getDataId());
|
|
|
SubDataVo subDataVo = new SubDataVo();
|
|
|
BeanUtils.copyProperties(dto,subDataVo);
|
|
|
return subDataVo;
|
|
|
@@ -220,9 +218,6 @@ public class DataAuthController {
|
|
|
for (DataAuthAcceptVo vo : authVoList) {
|
|
|
SubDataDTO subDataDTO = new SubDataDTO();
|
|
|
String dataId = vo.getDataId();
|
|
|
- //除去分级分类标签的code
|
|
|
- int index = dataId.indexOf(idJoin);
|
|
|
- //从dataId截取拼接各种参数
|
|
|
subDataDTO.setDataId(dataId);
|
|
|
subDataDTO.setClassifyCode(vo.getClassifyCode());
|
|
|
dataDTOList.add(subDataDTO);
|
mazq