Merge remote-tracking branch 'origin/master'

Administrator

2023-08-21 fdbb8d1d091524727456bf63d86b9612d39f822d

 ard-work/src/main/java/com/ruoyi/device/external/service/impl/ArdEquipExternalServiceImpl.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.device.external.mapper.ArdEquipExternalMapper;
@@ -58,6 +59,7 @@
    public int insertArdEquipExternal(ArdEquipExternal ardEquipExternal)
    {
        //获取当前登录用户id
        ardEquipExternal.setId(IdUtils.simpleUUID());
        String userId = SecurityUtils.getUserId();
        ardEquipExternal.setCreateBy(userId);
        ardEquipExternal.setUserId(userId);