Merge remote-tracking branch 'origin/feature_help' into feature_help

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -292,31 +292,34 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     @Override
     public Result addQuestionInfo(AddQuestionCollectionFormDTO formDto) {
-        Result<UserDTO> userResult =  userInfoFeignClient.getUserInfoById(formDto.getUserInfo().getId().toString());
-        UserDTO user = null;
-        if(null == userResult.getData()){
-            throw new RenException("根据id未查到用户信息。");
+        logger.info("进入关联项目添加："+formDto);
+        UserDetail  user = formDto.getUserInfo();
+        Result<ParentAndAllDeptDTO> deptDTO = adminFeignClient.getParentAndAllDept(user.getDeptId());
+        if(null == deptDTO.getData()){
+            throw new RenException("未查到用户相关部门信息。");
         }
-        user = userResult.getData();
+        ParentAndAllDeptDTO deptMsg = deptDTO.getData();
+        logger.info("获取完部门数据："+deptMsg);
         ItemEntity entity = new ItemEntity();
-        entity.setUserId(user.getId());
-        entity.setNickName(user.getNickname());
-        entity.setUserFace(user.getFaceImg());
-        entity.setIsPartyMember(user.getPartyFlag());
+        entity.setUserId(user.getId().toString());
+        entity.setNickName(user.getUsername());
+        entity.setUserFace(user.getHeadUrl());
+        entity.setIsPartyMember("1");
         entity.setMobile(user.getMobile());
         entity.setItemContent(formDto.getQuestionDescribe());
         entity.setDistributeTime(new Date());
-        entity.setGrid(user.getGrid());
-        entity.setGridId(user.getGridId());
+        entity.setGrid(deptMsg.getGrid());
+        entity.setGridId(deptMsg.getGridId());
         entity.setItemState(0);
-        entity.setParentDeptIds(user.getParentDeptIds());
-        entity.setParentDeptNames(user.getParentDeptNames());
-        entity.setAllDeptIds(user.getAllDeptIds());
-        entity.setAllDeptNames(user.getAllDeptNames());
+        entity.setParentDeptIds(deptMsg.getParentDeptIds());
+        entity.setParentDeptNames(deptMsg.getParentDeptNames());
+        entity.setAllDeptIds(deptMsg.getAllDeptIds());
+        entity.setAllDeptNames(deptMsg.getAllDeptNames());
         entity.setCategoryCode("13");
         entity.setCategoryFullName("其他");
         entity.setFirstCategoryCode("13");
         baseDao.insert(entity);
+        logger.info("成功插入关联项目："+entity);
         return new Result().ok(entity.getId());
     }