feat: 流程入库 及 杂七杂八

adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java

@@ -44,7 +44,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
      **/
     @ApiOperation(value = "|DicTypeEO|新增")
     @PostMapping("/create")
-    @RequiresPermissions("sys:dicType:create")
+//    @RequiresPermissions("sys:dicType:create")
     public ResponseMessage<Integer> create(@RequestBody DicTypeEO dicTypeVO) throws Exception {
 
         //通过传入的code获取对象（此时id为空，sql做了判断）
@@ -72,7 +72,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
      **/
     @ApiOperation(value = "|DicTypeEO|企标大类新增")
     @PostMapping("/createEnterpriseStandard")
-    @RequiresPermissions("sys:dicType:createEnterpriseStandard")
+//    @RequiresPermissions("sys:dicType:createEnterpriseStandard")
     public ResponseMessage<Integer> createEnterpriseStandard(@RequestBody DicTypeEO dicTypeVO) throws Exception {
         dicTypeVO.setId(UUIDUtils.randomUUID20());
 //        liwenxuan:用来企业大类判断新增是否重复     有parentId代表查询里面的数据 (企业大类分页查找只显示根节点，编辑每条数据里面是他对应的孩子节点，是dicTypeEOService.getDicTypeEOTypeNameAndCode1方法)
@@ -129,7 +129,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
 
     @ApiOperation(value = "|DicTypeEO|国家/地区分页列表")
     @GetMapping("/pageCountry")
-    @RequiresPermissions("sys:dicType:pageListByDicIdAndNoParentId")
+//    @RequiresPermissions("sys:dicType:pageListByDicIdAndNoParentId")
     public ResponseMessage<PageInfo<DicTypeEO>> pageListByDicIdAndNoParentId(DicTypeEOPage page) throws Exception {
         page.setPager(new Pager());
         page.setValidFlag("0");
@@ -169,7 +169,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
      **/
     @ApiOperation(value = "|DicTypeEO|修改")
     @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
-    @RequiresPermissions("sys:dicType:update")
+//    @RequiresPermissions("sys:dicType:update")
     public ResponseMessage<Integer> update(@RequestBody DicTypeEO dicTypeVO) throws Exception {
         //        liwenxuan:用来企业大类判断新增是否重复     有parentId代表查询里面的数据
         if (dicTypeVO.getParentId() != null) {
@@ -227,7 +227,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
      **/
     @ApiOperation(value = "|DicTypeEO|详情")
     @GetMapping("/{id}")
-    @RequiresPermissions("sys:dicType:get")
+//    @RequiresPermissions("sys:dicType:get")
     public ResponseMessage<DicTypeEO> getById(@NotNull @PathVariable("id") String id) throws Exception {
         DicTypeEO dicTypeVO = dicTypeEOService.getDicTypeById(id);
         return Result.success(dicTypeVO);

adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java

@@ -53,7 +53,22 @@ public class UserEOController extends BaseController<UserEO> {
     @ApiOperation(value = "|UserEO|详情")
     @GetMapping("/{id}")
 //	@RequiresPermissions("sys:user:get")
-    public ResponseMessage<UserVO> getById(@NotNull @PathVariable("id") String id) throws Exception {
+    public ResponseMessage<UserVO> getById(@PathVariable("id") String id) throws Exception {
+        UserEO userEO = userEOService.getUserWithRoles(id);
+        UserVO userVO= new UserVO();
+        if(userEO!=null){
+            userVO = BeanUtil.toBean(userEO,UserVO.class);
+            userVO.setRoles(userEO.getRoleEOList());
+            userVO.setOrgsstr(userEO.getOrgIdList());
+            userVO.setOrgs(userEO.getOrgEOList());
+            userVO.setPassword(userEO.getPassword());
+        }
+        return Result.success(userVO);
+    }
+
+    @ApiOperation(value = "|UserEO|详情接口")
+    @GetMapping("/getById")
+    public ResponseMessage<UserVO> getByIdFeignClient(String id) throws Exception {
         UserEO userEO = userEOService.getUserWithRoles(id);
         UserVO userVO= new UserVO();
         if(userEO!=null){