问题处理

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -26,6 +26,7 @@ import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.contract.ContractShipmentService;
 import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -142,8 +143,8 @@ public class ContractFlow extends FlowDelegate {
         CustomizeAreaUtil.setAreaId(contract);
 
 //        contract.setId(contractId);
-
-        contract.setUserName(SecurityUtils.getUsername());
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        contract.setUserName(user.getNickName());
         contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         contract.setBuyCityId(contract.getCityId());
         contract.setBuyCountryId(contract.getCountryId());

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -533,8 +533,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     }
     /**
      * 开始公共代码抽取
-     *
-     * @param opType 操作类型 0直接发起 1重新发起
      */
     public ContractDto commStart(ContractDto contract) {
         // 赋值城市省份信息
@@ -1228,6 +1226,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             item.setCustomerName(customer.getName());
         });
 
+        //赋值业务员名称
+        UserUtil.assignmentNickName(records, ContractDocumentaryVo::getCreateUser, ContractDocumentaryVo::setUserName);
+
         return page;
     }